fix: use loop variable instead of global ticker in GenerateFreshName (#40)

## Description

`GenerateFreshName` used a global `ticker` variable but never incremented it inside the loop.
This caused an infinite loop if the first generated name (`_0`) was already in the used set.

- Remove global `ticker` variable.
- Use loop variable `i` directly to generate candidate names.

## Benefits

- Fixes infinite loop bug when generated name collides with used set.
- Removes unnecessary global state.
- Simpler and more predictable behavior.

## Checklist

- [x] Code follows conventional commit format.
- [x] Branch follows naming convention (`<type>/<description>`). Always use underscores.
- [x] Tests pass (if applicable).
- [x] Documentation updated (if applicable).

Reviewed-on: #40
Co-authored-by: M.V. Hutz <git@maximhutz.me>
Co-committed-by: M.V. Hutz <git@maximhutz.me>

.gitea/ISSUE_TEMPLATE/bug.md

@@ -1,6 +1,6 @@
 ---
 name: "Bug Report"
-about: "Report a bug or unexpected behavior in the lambda interpreter."
+about: "Report a bug or unexpected behavior in the lambda runtime."
 title: "fix: "
 ref: "main"
 assignees: []

.gitea/ISSUE_TEMPLATE/feature.md

@@ -1,6 +1,6 @@
 ---
 name: "Feature Request"
-about: "Suggest a new feature or enhancement for the lambda interpreter."
+about: "Suggest a new feature or enhancement for the lambda runtime."
 title: "feat: "
 ref: "main"
 assignees: []

CLAUDE.md

@@ -80,3 +80,26 @@ Use the `tea` CLI (Gitea command-line tool) for PR operations instead of `gh`.
 
 **Linking issues**: When a PR solves an issue, reference the issue in both the commit message and PR description using `Closes #<number>`.
 This automatically links and closes the issue when the PR is merged.
+
+### Updating PRs
+
+When pushing additional changes to an existing PR, add a comment summarizing the new commits.
+This keeps reviewers informed of what changed since the initial PR description.
+
+Use the `tea` CLI to add comments to pull requests:
+
+```bash
+tea comment <number> "Comment text"
+```
+
+#### Examples
+
+```bash
+# Add a comment to PR #42
+tea comment 42 "Updated implementation based on feedback"
+
+# Add a multi-line comment
+tea comment 42 "Summary of changes:
+- Fixed bug in reducer
+- Added new tests"
+```

LICENSE

@@ -48,7 +48,7 @@ The "source code" for a work means the preferred form of the work for making mod
 
 A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
 
-The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form.  A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
+The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form.  A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code runtime used to run it.
 
 The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities.  However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work.  For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those
 subprograms and other parts of the work.

Makefile

@@ -8,7 +8,7 @@ TEST=simple
 help:
 	echo "Available targets:"
 	echo "  build    - Build the lambda executable"
-	echo "  run      - Build and run the lambda interpreter (use TEST=<name> to specify sample)"
+	echo "  run      - Build and run the lambda runtime (use TEST=<name> to specify sample)"
 	echo "  profile  - Build and run with CPU profiling enabled"
 	echo "  explain  - Build and run with explanation mode and profiling"
 	echo "  graph    - Generate and open CPU profile visualization"

README.md

@@ -1,6 +1,6 @@
 # lambda
 
-Making a lambda calculus interpreter in Go.
+Making a lambda calculus runtime in Go.
 
 ## Things to talk about
 

cmd/lambda/engine_test.go

@@ -1,98 +0,0 @@
-package main
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"git.maximhutz.com/max/lambda/internal/config"
-	"git.maximhutz.com/max/lambda/internal/engine"
-	"git.maximhutz.com/max/lambda/pkg/convert"
-	"git.maximhutz.com/max/lambda/pkg/saccharine"
-)
-
-func TestEngineEquivalence(t *testing.T) {
-	testsDir := "../../tests"
-	files, err := os.ReadDir(testsDir)
-	if err != nil {
-		t.Fatalf("Failed to read tests directory: %v", err)
-	}
-
-	for _, file := range files {
-		if !strings.HasSuffix(file.Name(), ".test") {
-			continue
-		}
-
-		testName := strings.TrimSuffix(file.Name(), ".test")
-		t.Run(testName, func(t *testing.T) {
-			// Read test input
-			inputPath := filepath.Join(testsDir, file.Name())
-			input, err := os.ReadFile(inputPath)
-			if err != nil {
-				t.Fatalf("Failed to read test file: %v", err)
-			}
-
-			// Parse syntax tree
-			ast, err := saccharine.Parse(string(input))
-			if err != nil {
-				t.Fatalf("Failed to parse input: %v", err)
-			}
-
-			// Test lambda engine
-			lambdaExpr := convert.SaccharineToLambda(ast)
-			lambdaCfg := &config.Config{Interpreter: "lambda"}
-			lambdaEngine := engine.NewLambdaEngine(lambdaCfg, &lambdaExpr)
-			lambdaEngine.Run()
-			lambdaResult := lambdaEngine.GetResult()
-
-			// Test De Bruijn engine
-			debruijnExpr := convert.SaccharineToDeBruijn(ast)
-			debruijnCfg := &config.Config{Interpreter: "debruijn"}
-			debruijnEngine := engine.NewDeBruijnEngine(debruijnCfg, &debruijnExpr)
-			debruijnEngine.Run()
-			debruijnResult := debruijnEngine.GetResult()
-
-			// Convert De Bruijn result back to lambda for comparison
-			debruijnConverted := convert.DeBruijnToLambda(*debruijnEngine.Expression)
-			debruijnConvertedStr := convert.DeBruijnToLambda(*debruijnEngine.Expression)
-
-			// Check if expected file exists
-			expectedPath := filepath.Join(testsDir, testName+".expected")
-			if expectedBytes, err := os.ReadFile(expectedPath); err == nil {
-				expected := strings.TrimSpace(string(expectedBytes))
-
-				if lambdaResult != expected {
-					t.Errorf("Lambda engine result mismatch:\nExpected: %s\nGot: %s", expected, lambdaResult)
-				}
-
-				// De Bruijn result will have different variable names, so we just check it runs
-				if debruijnResult == "" {
-					t.Errorf("De Bruijn engine produced empty result")
-				}
-			}
-
-			// Log results for comparison
-			t.Logf("Lambda result: %s", lambdaResult)
-			t.Logf("De Bruijn result: %s", debruijnResult)
-			t.Logf("De Bruijn converted: %v", debruijnConvertedStr)
-			_ = debruijnConverted // Suppress unused warning
-		})
-	}
-}
-
-func TestInvalidInterpreterFlag(t *testing.T) {
-	// This would be tested at the config level
-	cfg := &config.Config{Interpreter: "invalid"}
-
-	// The validation happens in FromArgs, but we can test the engine creation
-	// doesn't panic with invalid values
-	defer func() {
-		if r := recover(); r != nil {
-			t.Errorf("Engine creation panicked with invalid interpreter: %v", r)
-		}
-	}()
-
-	// Just check that default behavior works
-	_ = cfg
-}

cmd/lambda/lambda.go

@@ -1,17 +1,13 @@
 package main
 
 import (
-	"fmt"
 	"os"
 
 	"git.maximhutz.com/max/lambda/internal/cli"
 	"git.maximhutz.com/max/lambda/internal/config"
-	"git.maximhutz.com/max/lambda/internal/engine"
+	"git.maximhutz.com/max/lambda/internal/plugins"
-	"git.maximhutz.com/max/lambda/internal/performance"
-	"git.maximhutz.com/max/lambda/internal/statistics"
 	"git.maximhutz.com/max/lambda/pkg/convert"
-	"git.maximhutz.com/max/lambda/pkg/debruijn"
+	"git.maximhutz.com/max/lambda/pkg/normalorder"
-	"git.maximhutz.com/max/lambda/pkg/lambda"
 	"git.maximhutz.com/max/lambda/pkg/saccharine"
 )
 
@@ -33,92 +29,39 @@ func main() {
 	cli.HandleError(err)
 	logger.Info("parsed syntax tree", "tree", ast)
 
-	// Create reduction engine based on interpreter type.
-	var process engine.Engine
-	if options.Interpreter == "debruijn" {
-		// Compile expression to De Bruijn indices.
-		compiled := convert.SaccharineToDeBruijn(ast)
-		logger.Info("compiled De Bruijn expression", "tree", debruijn.Stringify(compiled))
-		dbEngine := engine.NewDeBruijnEngine(options, &compiled)
-
-		// If the user selected to track CPU performance, attach a profiler.
-		if options.Profile != "" {
-			profiler := performance.Track(options.Profile)
-			dbEngine.On("start", profiler.Start)
-			dbEngine.On("end", profiler.End)
-		}
-
-		// If the user selected to produce a step-by-step explanation, print steps.
-		if options.Explanation {
-			dbEngine.On("start", func() {
-				fmt.Println(debruijn.Stringify(*dbEngine.Expression))
-			})
-			dbEngine.On("step", func() {
-				fmt.Println("    =", debruijn.Stringify(*dbEngine.Expression))
-			})
-		}
-
-		// If the user opted to track statistics, attach a tracker.
-		if options.Statistics {
-			statistics := statistics.Track()
-			dbEngine.On("start", statistics.Start)
-			dbEngine.On("step", statistics.Step)
-			dbEngine.On("end", statistics.End)
-		}
-
-		// If the user selected for verbose debug logs, attach a reduction tracker.
-		if options.Verbose {
-			dbEngine.On("step", func() {
-				logger.Info("reduction", "tree", debruijn.Stringify(*dbEngine.Expression))
-			})
-		}
-
-		process = dbEngine
-	} else {
 	// Compile expression to lambda calculus.
 	compiled := convert.SaccharineToLambda(ast)
-		logger.Info("compiled λ expression", "tree", lambda.Stringify(compiled))
+	logger.Info("compiled λ expression", "tree", compiled.String())
-		lambdaEngine := engine.NewLambdaEngine(options, &compiled)
+
+	// Create reducer with the compiled expression.
+	runtime := normalorder.NewRuntime(compiled)
 
 	// If the user selected to track CPU performance, attach a profiler.
 	if options.Profile != "" {
-			profiler := performance.Track(options.Profile)
+		plugins.NewPerformance(options.Profile, runtime)
-			lambdaEngine.On("start", profiler.Start)
-			lambdaEngine.On("end", profiler.End)
 	}
 
-		// If the user selected to produce a step-by-step explanation, print steps.
+	// If the user selected to produce a step-by-step explanation, attach an
+	// observer.
 	if options.Explanation {
-			lambdaEngine.On("start", func() {
+		plugins.NewExplanation(runtime)
-				fmt.Println(lambda.Stringify(*lambdaEngine.Expression))
-			})
-			lambdaEngine.On("step", func() {
-				fmt.Println("    =", lambda.Stringify(*lambdaEngine.Expression))
-			})
 	}
 
 	// If the user opted to track statistics, attach a tracker.
 	if options.Statistics {
-			statistics := statistics.Track()
+		plugins.NewStatistics(runtime)
-			lambdaEngine.On("start", statistics.Start)
-			lambdaEngine.On("step", statistics.Step)
-			lambdaEngine.On("end", statistics.End)
 	}
 
 	// If the user selected for verbose debug logs, attach a reduction tracker.
 	if options.Verbose {
-			lambdaEngine.On("step", func() {
+		plugins.NewLogs(logger, runtime)
-				logger.Info("reduction", "tree", lambda.Stringify(*lambdaEngine.Expression))
-			})
 	}
 
-		process = lambdaEngine
+	// Run reduction.
-	}
+	runtime.Run()
-
-	process.Run()
 
 	// Return the final reduced result.
-	result := process.GetResult()
+	result := runtime.Expression().String()
 	err = options.Destination.Write(result)
 	cli.HandleError(err)
 }

cmd/lambda/lambda_test.go

@@ -6,15 +6,13 @@ import (
 	"strings"
 	"testing"
 
-	"git.maximhutz.com/max/lambda/internal/config"
-	"git.maximhutz.com/max/lambda/internal/engine"
 	"git.maximhutz.com/max/lambda/pkg/convert"
-	"git.maximhutz.com/max/lambda/pkg/lambda"
+	"git.maximhutz.com/max/lambda/pkg/normalorder"
 	"git.maximhutz.com/max/lambda/pkg/saccharine"
 	"github.com/stretchr/testify/assert"
 )
 
-// Helper function to run a single sample through the lambda interpreter.
+// Helper function to run a single sample through the lambda runtime.
 func runSample(samplePath string) (string, error) {
 	// Read the sample file.
 	input, err := os.ReadFile(samplePath)
@@ -31,21 +29,11 @@ func runSample(samplePath string) (string, error) {
 	// Compile expression to lambda calculus.
 	compiled := convert.SaccharineToLambda(ast)
 
-	// Create minimal config for benchmarking.
+	// Create and run the reducer.
-	cfg := &config.Config{
+	reducer := normalorder.NewRuntime(compiled)
-		Source:      config.StringSource{Data: ""},
+	reducer.Run()
-		Destination: config.StdoutDestination{},
-		Profile:     "",
-		Explanation: false,
-		Statistics:  false,
-		Verbose:     false,
-	}
 
-	// Create and run the engine.
+	return reducer.Expression().String() + "\n", nil
-	process := engine.New(cfg, &compiled)
-	process.Run()
-
-	return lambda.Stringify(compiled) + "\n", nil
 }
 
 // Test that all samples produce expected output.

internal/config/config.go

@@ -9,5 +9,4 @@ type Config struct {
 	Explanation bool        // Whether or not to print an explanation of the reduction.
 	Profile     string      // If not nil, print a CPU profile during execution.
 	Statistics  bool        // Whether or not to print statistics.
-	Interpreter string      // The interpreter to use: "lambda" or "debruijn".
 }

internal/config/parse_from_args.go

@@ -14,7 +14,6 @@ func FromArgs() (*Config, error) {
 	profile := flag.String("p", "", "CPU profiling. If an output file is defined, the program will profile its execution and dump its results into it.")
 	file := flag.String("f", "", "File. If set, read source from the specified file.")
 	output := flag.String("o", "", "Output. If set, write result to the specified file. Use '-' for stdout (default).")
-	interpreter := flag.String("i", "lambda", "Interpreter. Choose 'lambda' or 'debruijn' reduction engine (default: lambda).")
 	flag.Parse()
 
 	// Parse source type.
@@ -46,11 +45,6 @@ func FromArgs() (*Config, error) {
 		destination = FileDestination{Path: *output}
 	}
 
-	// Validate interpreter flag.
-	if *interpreter != "lambda" && *interpreter != "debruijn" {
-		return nil, fmt.Errorf("invalid interpreter: %s (must be 'lambda' or 'debruijn')", *interpreter)
-	}
-
 	return &Config{
 		Source:      source,
 		Destination: destination,
@@ -58,6 +52,5 @@ func FromArgs() (*Config, error) {
 		Explanation: *explanation,
 		Profile:     *profile,
 		Statistics:  *statistics,
-		Interpreter: *interpreter,
 	}, nil
 }

internal/engine/debruijn_engine.go

@@ -1,36 +0,0 @@
-package engine
-
-import (
-	"git.maximhutz.com/max/lambda/internal/config"
-	"git.maximhutz.com/max/lambda/pkg/debruijn"
-	"git.maximhutz.com/max/lambda/pkg/emitter"
-)
-
-// A process for reducing one λ-expression using De Bruijn indices.
-type DeBruijnEngine struct {
-	Config     *config.Config
-	Expression *debruijn.Expression
-	emitter.Emitter
-}
-
-// NewDeBruijnEngine creates a new De Bruijn engine.
-func NewDeBruijnEngine(config *config.Config, expression interface{}) *DeBruijnEngine {
-	expr := expression.(*debruijn.Expression)
-	return &DeBruijnEngine{Config: config, Expression: expr}
-}
-
-// Run begins the reduction process.
-func (e *DeBruijnEngine) Run() {
-	e.Emit("start")
-
-	debruijn.ReduceAll(e.Expression, func() {
-		e.Emit("step")
-	})
-
-	e.Emit("end")
-}
-
-// GetResult returns the stringified result.
-func (e *DeBruijnEngine) GetResult() string {
-	return debruijn.Stringify(*e.Expression)
-}

internal/engine/interface.go

@@ -1,24 +0,0 @@
-// Package "engine" provides an extensible interface for users to interfact with
-// λ-calculus.
-package engine
-
-import (
-	"git.maximhutz.com/max/lambda/internal/config"
-	"git.maximhutz.com/max/lambda/pkg/emitter"
-)
-
-// Engine is an interface for reduction engines.
-type Engine interface {
-	Run()
-	GetResult() string
-	On(message string, fn func()) *emitter.Observer
-	Emit(message string)
-}
-
-// New creates the appropriate engine based on the config.
-func New(cfg *config.Config, input interface{}) Engine {
-	if cfg.Interpreter == "debruijn" {
-		return NewDeBruijnEngine(cfg, input)
-	}
-	return NewLambdaEngine(cfg, input)
-}

internal/engine/lambda_engine.go

@@ -1,36 +0,0 @@
-package engine
-
-import (
-	"git.maximhutz.com/max/lambda/internal/config"
-	"git.maximhutz.com/max/lambda/pkg/emitter"
-	"git.maximhutz.com/max/lambda/pkg/lambda"
-)
-
-// A process for reducing one λ-expression using named variables.
-type LambdaEngine struct {
-	Config     *config.Config
-	Expression *lambda.Expression
-	emitter.Emitter
-}
-
-// NewLambdaEngine creates a new lambda engine.
-func NewLambdaEngine(config *config.Config, expression interface{}) *LambdaEngine {
-	expr := expression.(*lambda.Expression)
-	return &LambdaEngine{Config: config, Expression: expr}
-}
-
-// Run begins the reduction process.
-func (e *LambdaEngine) Run() {
-	e.Emit("start")
-
-	lambda.ReduceAll(e.Expression, func() {
-		e.Emit("step")
-	})
-
-	e.Emit("end")
-}
-
-// GetResult returns the stringified result.
-func (e *LambdaEngine) GetResult() string {
-	return lambda.Stringify(*e.Expression)
-}

internal/explanation/tracker.go

@@ -1,32 +0,0 @@
-// Package "explanation" provides a observer to gather the reasoning during the
-// reduction, and present a thorough explanation to the user for each step.
-package explanation
-
-import (
-	"fmt"
-
-	"git.maximhutz.com/max/lambda/internal/engine"
-	"git.maximhutz.com/max/lambda/pkg/lambda"
-)
-
-// Track the reductions made by a reduction proess.
-type Tracker struct {
-	process *engine.Engine
-}
-
-// Attaches a new explanation tracker to a process.
-func Track(process *engine.Engine) *Tracker {
-	tracker := &Tracker{process: process}
-	process.On("start", tracker.Start)
-	process.On("step", tracker.Step)
-
-	return tracker
-}
-
-func (t *Tracker) Start() {
-	fmt.Println(lambda.Stringify(*t.process.Expression))
-}
-
-func (t *Tracker) Step() {
-	fmt.Println("    =", lambda.Stringify(*t.process.Expression))
-}

internal/plugins/debug.go

@@ -0,0 +1,23 @@
+package plugins
+
+import (
+	"log/slog"
+
+	"git.maximhutz.com/max/lambda/pkg/runtime"
+)
+
+type Logs struct {
+	logger  *slog.Logger
+	reducer runtime.Runtime
+}
+
+func NewLogs(logger *slog.Logger, r runtime.Runtime) *Logs {
+	plugin := &Logs{logger, r}
+	r.On(runtime.StepEvent, plugin.Step)
+
+	return plugin
+}
+
+func (t *Logs) Step() {
+	t.logger.Info("reduction", "tree", t.reducer.Expression().String())
+}

internal/plugins/explanation.go

@@ -0,0 +1,31 @@
+// Package "explanation" provides an observer to gather the reasoning during the
+// reduction, and present a thorough explanation to the user for each step.
+package plugins
+
+import (
+	"fmt"
+
+	"git.maximhutz.com/max/lambda/pkg/runtime"
+)
+
+// Track the reductions made by a reduction process.
+type Explanation struct {
+	reducer runtime.Runtime
+}
+
+// Attaches a new explanation tracker to a reducer.
+func NewExplanation(r runtime.Runtime) *Explanation {
+	plugin := &Explanation{reducer: r}
+	r.On(runtime.StartEvent, plugin.Start)
+	r.On(runtime.StepEvent, plugin.Step)
+
+	return plugin
+}
+
+func (t *Explanation) Start() {
+	fmt.Println(t.reducer.Expression().String())
+}
+
+func (t *Explanation) Step() {
+	fmt.Println("    =", t.reducer.Expression().String())
+}

internal/plugins/performance.go

@@ -1,28 +1,34 @@
 // Package "performance" provides a tracker to observer CPU performance during
 // execution.
-package performance
+package plugins
 
 import (
 	"os"
 	"path/filepath"
 	"runtime/pprof"
+
+	"git.maximhutz.com/max/lambda/pkg/runtime"
 )
 
 // Observes a reduction process, and publishes a CPU performance profile on
 // completion.
-type Tracker struct {
+type Performance struct {
 	File        string
 	filePointer *os.File
 	Error       error
 }
 
 // Create a performance tracker that outputs a profile to "file".
-func Track(file string) *Tracker {
+func NewPerformance(file string, process runtime.Runtime) *Performance {
-	return &Tracker{File: file}
+	plugin := &Performance{File: file}
+	process.On(runtime.StartEvent, plugin.Start)
+	process.On(runtime.StopEvent, plugin.Stop)
+
+	return plugin
 }
 
 // Begin profiling.
-func (t *Tracker) Start() {
+func (t *Performance) Start() {
 	var absPath string
 
 	absPath, t.Error = filepath.Abs(t.File)
@@ -47,7 +53,7 @@ func (t *Tracker) Start() {
 }
 
 // Stop profiling.
-func (t *Tracker) End() {
+func (t *Performance) Stop() {
 	pprof.StopCPUProfile()
 	t.filePointer.Close()
 }

internal/plugins/statistics.go

@@ -0,0 +1,44 @@
+package plugins
+
+import (
+	"fmt"
+	"os"
+	"time"
+
+	"git.maximhutz.com/max/lambda/internal/statistics"
+	"git.maximhutz.com/max/lambda/pkg/runtime"
+)
+
+// An observer, to track reduction performance.
+type Statistics struct {
+	start time.Time
+	steps uint64
+}
+
+// Create a new reduction performance Statistics.
+func NewStatistics(r runtime.Runtime) *Statistics {
+	plugin := &Statistics{}
+	r.On(runtime.StartEvent, plugin.Start)
+	r.On(runtime.StepEvent, plugin.Step)
+	r.On(runtime.StopEvent, plugin.Stop)
+
+	return plugin
+}
+
+func (t *Statistics) Start() {
+	t.start = time.Now()
+	t.steps = 0
+}
+
+func (t *Statistics) Step() {
+	t.steps++
+}
+
+func (t *Statistics) Stop() {
+	results := statistics.Results{
+		StepsTaken:  t.steps,
+		TimeElapsed: uint64(time.Since(t.start).Milliseconds()),
+	}
+
+	fmt.Fprint(os.Stderr, results.String())
+}

internal/statistics/tracker.go

@@ -1,36 +0,0 @@
-package statistics
-
-import (
-	"fmt"
-	"os"
-	"time"
-)
-
-// An observer, to track reduction performance.
-type Tracker struct {
-	start time.Time
-	steps uint64
-}
-
-// Create a new reduction performance tracker.
-func Track() *Tracker {
-	return &Tracker{}
-}
-
-func (t *Tracker) Start() {
-	t.start = time.Now()
-	t.steps = 0
-}
-
-func (t *Tracker) Step() {
-	t.steps++
-}
-
-func (t *Tracker) End() {
-	results := Results{
-		StepsTaken:  t.steps,
-		TimeElapsed: uint64(time.Since(t.start).Milliseconds()),
-	}
-
-	fmt.Fprint(os.Stderr, results.String())
-}

pkg/convert/debruijn_to_lambda.go

@@ -1,63 +0,0 @@
-package convert
-
-import (
-	"fmt"
-
-	"git.maximhutz.com/max/lambda/pkg/debruijn"
-	"git.maximhutz.com/max/lambda/pkg/lambda"
-)
-
-// DeBruijnToLambda converts a De Bruijn expression back to named lambda calculus.
-func DeBruijnToLambda(expr debruijn.Expression) lambda.Expression {
-	return deBruijnToLambda(expr, []string{})
-}
-
-func deBruijnToLambda(expr debruijn.Expression, context []string) lambda.Expression {
-	switch e := expr.(type) {
-	case *debruijn.Variable:
-		if e.Index() >= 0 && e.Index() < len(context) {
-			return lambda.NewVariable(context[e.Index()])
-		}
-		if e.Label() != "" {
-			return lambda.NewVariable(e.Label())
-		}
-		return lambda.NewVariable(fmt.Sprintf("free_%d", e.Index()))
-
-	case *debruijn.Abstraction:
-		paramName := generateParamName(context)
-		newContext := append([]string{paramName}, context...)
-		body := deBruijnToLambda(e.Body(), newContext)
-		return lambda.NewAbstraction(paramName, body)
-
-	case *debruijn.Application:
-		abs := deBruijnToLambda(e.Abstraction(), context)
-		arg := deBruijnToLambda(e.Argument(), context)
-		return lambda.NewApplication(abs, arg)
-
-	default:
-		return nil
-	}
-}
-
-// generateParamName generates a fresh parameter name that doesn't conflict with context.
-func generateParamName(context []string) string {
-	base := 'a'
-	for i := 0; ; i++ {
-		name := string(rune(base + rune(i%26)))
-		if i >= 26 {
-			name = fmt.Sprintf("%s%d", name, i/26)
-		}
-
-		conflict := false
-		for _, existing := range context {
-			if existing == name {
-				conflict = true
-				break
-			}
-		}
-
-		if !conflict {
-			return name
-		}
-	}
-}

pkg/convert/lambda_to_debruijn.go

@@ -1,43 +0,0 @@
-package convert
-
-import (
-	"git.maximhutz.com/max/lambda/pkg/debruijn"
-	"git.maximhutz.com/max/lambda/pkg/lambda"
-)
-
-// LambdaToDeBruijn converts a lambda expression to De Bruijn index representation.
-func LambdaToDeBruijn(expr lambda.Expression) debruijn.Expression {
-	return lambdaToDeBruijn(expr, []string{})
-}
-
-func lambdaToDeBruijn(expr lambda.Expression, context []string) debruijn.Expression {
-	switch e := expr.(type) {
-	case *lambda.Variable:
-		index := findIndex(e.Value(), context)
-		return debruijn.NewVariable(index, e.Value())
-
-	case *lambda.Abstraction:
-		newContext := append([]string{e.Parameter()}, context...)
-		body := lambdaToDeBruijn(e.Body(), newContext)
-		return debruijn.NewAbstraction(body)
-
-	case *lambda.Application:
-		abs := lambdaToDeBruijn(e.Abstraction(), context)
-		arg := lambdaToDeBruijn(e.Argument(), context)
-		return debruijn.NewApplication(abs, arg)
-
-	default:
-		return nil
-	}
-}
-
-// findIndex returns the De Bruijn index for a variable name in the context.
-// Returns the index if found, or -1 if the variable is free.
-func findIndex(name string, context []string) int {
-	for i, v := range context {
-		if v == name {
-			return i
-		}
-	}
-	return -1
-}

pkg/convert/saccharine_to_debruijn.go

@@ -1,12 +0,0 @@
-package convert
-
-import (
-	"git.maximhutz.com/max/lambda/pkg/debruijn"
-	"git.maximhutz.com/max/lambda/pkg/saccharine"
-)
-
-// SaccharineToDeBruijn converts a saccharine expression directly to De Bruijn indices.
-func SaccharineToDeBruijn(expr saccharine.Expression) debruijn.Expression {
-	lambdaExpr := SaccharineToLambda(expr)
-	return LambdaToDeBruijn(lambdaExpr)
-}

pkg/convert/saccharine_to_lambda.go

@@ -19,7 +19,7 @@ func convertAbstraction(n *saccharine.Abstraction) lambda.Expression {
 	// If the function has no parameters, it is a thunk. Lambda calculus still
 	// requires _some_ parameter exists, so generate one.
 	if len(parameters) == 0 {
-		freeVars := lambda.GetFreeVariables(result)
+		freeVars := result.GetFree()
 		freshName := lambda.GenerateFreshName(freeVars)
 		parameters = append(parameters, freshName)
 	}
@@ -63,7 +63,7 @@ func reduceLet(s *saccharine.LetStatement, e lambda.Expression) lambda.Expressio
 }
 
 func reduceDeclare(s *saccharine.DeclareStatement, e lambda.Expression) lambda.Expression {
-	freshVar := lambda.GenerateFreshName(lambda.GetFreeVariables(e))
+	freshVar := lambda.GenerateFreshName(e.GetFree())
 
 	return lambda.NewApplication(
 		lambda.NewAbstraction(freshVar, e),

pkg/debruijn/expression.go

@@ -1,77 +0,0 @@
-package debruijn
-
-type Expression interface {
-	Accept(Visitor)
-}
-
-/** ------------------------------------------------------------------------- */
-
-type Abstraction struct {
-	body Expression
-}
-
-func (a *Abstraction) Body() Expression {
-	return a.body
-}
-
-func (a *Abstraction) Accept(v Visitor) {
-	v.VisitAbstraction(a)
-}
-
-func NewAbstraction(body Expression) *Abstraction {
-	return &Abstraction{body: body}
-}
-
-/** ------------------------------------------------------------------------- */
-
-type Application struct {
-	abstraction Expression
-	argument    Expression
-}
-
-func (a *Application) Abstraction() Expression {
-	return a.abstraction
-}
-
-func (a *Application) Argument() Expression {
-	return a.argument
-}
-
-func (a *Application) Accept(v Visitor) {
-	v.VisitApplication(a)
-}
-
-func NewApplication(abstraction Expression, argument Expression) *Application {
-	return &Application{abstraction: abstraction, argument: argument}
-}
-
-/** ------------------------------------------------------------------------- */
-
-type Variable struct {
-	index int
-	label string
-}
-
-func (v *Variable) Index() int {
-	return v.index
-}
-
-func (v *Variable) Label() string {
-	return v.label
-}
-
-func (v *Variable) Accept(visitor Visitor) {
-	visitor.VisitVariable(v)
-}
-
-func NewVariable(index int, label string) *Variable {
-	return &Variable{index: index, label: label}
-}
-
-/** ------------------------------------------------------------------------- */
-
-type Visitor interface {
-	VisitAbstraction(*Abstraction)
-	VisitApplication(*Application)
-	VisitVariable(*Variable)
-}

pkg/debruijn/iterator.go

@@ -1,68 +0,0 @@
-package debruijn
-
-type Iterator struct {
-	trace []*Expression
-}
-
-func NewIterator(expr *Expression) *Iterator {
-	return &Iterator{[]*Expression{expr}}
-}
-
-func (i *Iterator) Done() bool {
-	return len(i.trace) == 0
-}
-
-func (i *Iterator) Current() *Expression {
-	if i.Done() {
-		return nil
-	}
-
-	return i.trace[len(i.trace)-1]
-}
-
-func (i *Iterator) Parent() *Expression {
-	if len(i.trace) < 2 {
-		return nil
-	}
-
-	return i.trace[len(i.trace)-2]
-}
-
-func (i *Iterator) Swap(with Expression) {
-	current := i.Current()
-	if current != nil {
-		*current = with
-	}
-}
-
-func (i *Iterator) Back() bool {
-	if i.Done() {
-		return false
-	}
-
-	i.trace = i.trace[:len(i.trace)-1]
-	return true
-}
-
-func (i *Iterator) Next() {
-	switch typed := (*i.Current()).(type) {
-	case *Abstraction:
-		i.trace = append(i.trace, &typed.body)
-	case *Application:
-		i.trace = append(i.trace, &typed.abstraction)
-	case *Variable:
-		for len(i.trace) > 1 {
-			if app, ok := (*i.Parent()).(*Application); ok {
-				if app.abstraction == *i.Current() {
-					i.Back()
-					i.trace = append(i.trace, &app.argument)
-					return
-				}
-			}
-
-			i.Back()
-		}
-
-		i.trace = []*Expression{}
-	}
-}

pkg/debruijn/reduce.go

@@ -1,30 +0,0 @@
-package debruijn
-
-func IsViable(e *Expression) (*Abstraction, Expression, bool) {
-	if e == nil {
-		return nil, nil, false
-	} else if app, appOk := (*e).(*Application); !appOk {
-		return nil, nil, false
-	} else if fn, fnOk := app.abstraction.(*Abstraction); !fnOk {
-		return nil, nil, false
-	} else {
-		return fn, app.argument, true
-	}
-}
-
-func ReduceAll(e *Expression, step func()) {
-	it := NewIterator(e)
-
-	for !it.Done() {
-		if fn, arg, ok := IsViable(it.Current()); !ok {
-			it.Next()
-		} else {
-			it.Swap(Substitute(fn.body, arg))
-			step()
-
-			if _, _, ok := IsViable(it.Parent()); ok {
-				it.Back()
-			}
-		}
-	}
-}

pkg/debruijn/stringify.go

@@ -1,38 +0,0 @@
-package debruijn
-
-import (
-	"fmt"
-	"strings"
-)
-
-type stringifyVisitor struct {
-	builder strings.Builder
-}
-
-func (v *stringifyVisitor) VisitVariable(a *Variable) {
-	if a.label != "" {
-		v.builder.WriteString(a.label)
-	} else {
-		v.builder.WriteString(fmt.Sprintf("%d", a.index))
-	}
-}
-
-func (v *stringifyVisitor) VisitAbstraction(f *Abstraction) {
-	v.builder.WriteRune('\\')
-	v.builder.WriteRune('.')
-	f.body.Accept(v)
-}
-
-func (v *stringifyVisitor) VisitApplication(c *Application) {
-	v.builder.WriteRune('(')
-	c.abstraction.Accept(v)
-	v.builder.WriteRune(' ')
-	c.argument.Accept(v)
-	v.builder.WriteRune(')')
-}
-
-func Stringify(e Expression) string {
-	b := &stringifyVisitor{builder: strings.Builder{}}
-	e.Accept(b)
-	return b.builder.String()
-}

pkg/debruijn/substitute.go

@@ -1,68 +0,0 @@
-package debruijn
-
-// Shift increments all free variable indices by delta when crossing depth abstractions.
-func Shift(expr Expression, delta int, depth int) Expression {
-	switch e := expr.(type) {
-	case *Variable:
-		if e.index >= depth {
-			return NewVariable(e.index+delta, e.label)
-		}
-		return e
-
-	case *Abstraction:
-		newBody := Shift(e.body, delta, depth+1)
-		if newBody == e.body {
-			return e
-		}
-		return NewAbstraction(newBody)
-
-	case *Application:
-		newAbs := Shift(e.abstraction, delta, depth)
-		newArg := Shift(e.argument, delta, depth)
-		if newAbs == e.abstraction && newArg == e.argument {
-			return e
-		}
-		return NewApplication(newAbs, newArg)
-
-	default:
-		return expr
-	}
-}
-
-// Substitute replaces variable at index 0 with replacement in expr.
-// This assumes expr is the body of an abstraction being applied.
-func Substitute(expr Expression, replacement Expression) Expression {
-	return substitute(expr, 0, replacement)
-}
-
-// substitute replaces variable at targetIndex with replacement, adjusting indices as needed.
-func substitute(expr Expression, targetIndex int, replacement Expression) Expression {
-	switch e := expr.(type) {
-	case *Variable:
-		if e.index == targetIndex {
-			return Shift(replacement, targetIndex, 0)
-		}
-		if e.index > targetIndex {
-			return NewVariable(e.index-1, e.label)
-		}
-		return e
-
-	case *Abstraction:
-		newBody := substitute(e.body, targetIndex+1, replacement)
-		if newBody == e.body {
-			return e
-		}
-		return NewAbstraction(newBody)
-
-	case *Application:
-		newAbs := substitute(e.abstraction, targetIndex, replacement)
-		newArg := substitute(e.argument, targetIndex, replacement)
-		if newAbs == e.abstraction && newArg == e.argument {
-			return e
-		}
-		return NewApplication(newAbs, newArg)
-
-	default:
-		return expr
-	}
-}

pkg/deltanet/deltanet.go

@@ -1,6 +0,0 @@
-// Package "deltanet" is a reduction strategy using ∆-nets.
-package deltanet
-
-type Graph struct {
-	Nodes []Node
-}

pkg/deltanet/node.go

@@ -1,94 +0,0 @@
-package deltanet
-
-/** ------------------------------------------------------------------------- */
-
-// A connection between exactly two nodes in a graph.
-type Edge struct {
-	A, B Node
-}
-
-// Returns all nodes the edge is connected to.
-func (e Edge) GetConnections() []Node { return []Node{e.A, e.B} }
-
-// Determines if a node is connected via this edge.
-func (e Edge) IsConnected(n Node) bool { return e.A == n || e.B == n }
-
-// Swaps an edges connected with one node, for another.
-func (e *Edge) Swap(from Node, to Node) {
-	if e.A == from {
-		e.A = to
-	}
-	if e.B == from {
-		e.B = to
-	}
-}
-
-// Returns true if the edge is connected to each node via their pricniple ports.
-func (e Edge) IsPrincipleEdge() bool {
-	return e.A.GetMainPort() == e && e.B.GetMainPort() == e
-}
-
-/** ------------------------------------------------------------------------- */
-
-type Node interface {
-	// Returns the principle port that the node is attached to.
-	GetMainPort() Edge
-
-	// Returns all auxiliary ports that the node has. These ports are guaranteed
-	// to be ordered clockwise, as they would appear graphically.
-	GetAuxPorts() []Edge
-
-	// Returns the label of the node. May be blank.
-	GetLabel() string
-}
-
-/** ------------------------------------------------------------------------- */
-
-type EraserNode struct {
-	Main Edge
-}
-
-func (n EraserNode) GetLabel() string    { return "Ⓧ" }
-func (n EraserNode) GetMainPort() Edge   { return n.Main }
-func (n EraserNode) GetAuxPorts() []Edge { return []Edge{} }
-
-/** ------------------------------------------------------------------------- */
-
-type ReplicatorNode struct {
-	Main   Edge
-	Level  uint
-	Aux    []Edge
-	Deltas []int
-}
-
-func (n ReplicatorNode) GetLabel() string    { return "" }
-func (n ReplicatorNode) GetMainPort() Edge   { return n.Main }
-func (n ReplicatorNode) GetAuxPorts() []Edge { return n.Aux }
-
-// Returns the level of the replicator node.
-func (n ReplicatorNode) GetLevel() uint { return n.Level }
-
-/** ------------------------------------------------------------------------- */
-
-type FanNode struct {
-	Label       string
-	Main        Edge
-	Left, Right Edge
-}
-
-func (n FanNode) GetLabel() string    { return n.Label }
-func (n FanNode) GetMainPort() Edge   { return n.Main }
-func (n FanNode) GetAuxPorts() []Edge { return []Edge{n.Left, n.Right} }
-
-/** ------------------------------------------------------------------------- */
-
-type TerminalNode struct {
-	Label string
-	Main  Edge
-}
-
-func (n TerminalNode) GetLabel() string    { return n.Label }
-func (n TerminalNode) GetMainPort() Edge   { return n.Main }
-func (n TerminalNode) GetAuxPorts() []Edge { return []Edge{} }
-
-/** ------------------------------------------------------------------------- */

pkg/emitter/emitter.go

@@ -2,53 +2,45 @@ package emitter
 
 import "git.maximhutz.com/max/lambda/pkg/set"
 
-type Observer struct {
+type Emitter[E comparable] interface {
-	fn      func()
+	On(E, func()) Listener[E]
-	message string
+	Off(Listener[E])
-	emitter *Emitter
+	Emit(E)
 }
 
-type Emitter struct {
+type BaseEmitter[E comparable] struct {
-	listeners map[string]*set.Set[*Observer]
+	listeners map[E]set.Set[Listener[E]]
 }
 
-func Ignore[T any](fn func()) func(T) {
+func (e *BaseEmitter[E]) On(kind E, fn func()) Listener[E] {
-	return func(T) { fn() }
+	if e.listeners[kind] == nil {
+		e.listeners[kind] = set.New[Listener[E]]()
+	}
+
+	listener := &BaseListener[E]{kind, fn}
+	e.listeners[kind].Add(listener)
+	return listener
 }
 
-func (e *Emitter) On(message string, fn func()) *Observer {
+func (e *BaseEmitter[E]) Off(listener Listener[E]) {
-	observer := &Observer{
+	kind := listener.Kind()
-		fn:      fn,
+	if e.listeners[kind] != nil {
-		message: message,
+		e.listeners[kind].Remove(listener)
-		emitter: e,
+	}
-	}
+}
-
+
-	if e.listeners == nil {
+func (e *BaseEmitter[E]) Emit(event E) {
-		e.listeners = map[string]*set.Set[*Observer]{}
+	if e.listeners[event] == nil {
-	}
+		e.listeners[event] = set.New[Listener[E]]()
-
+	}
-	if e.listeners[message] == nil {
+
-		e.listeners[message] = set.New[*Observer]()
+	for listener := range e.listeners[event].Items() {
-	}
+		listener.Run()
-
+	}
-	e.listeners[message].Add(observer)
+}
-	return observer
+
-}
+func New[E comparable]() *BaseEmitter[E] {
-
+	return &BaseEmitter[E]{
-func (o *Observer) Off() {
+		listeners: map[E]set.Set[Listener[E]]{},
-	if o.emitter.listeners[o.message] == nil {
-		return
-	}
-
-	o.emitter.listeners[o.message].Remove(o)
-}
-
-func (e *Emitter) Emit(message string) {
-	if e.listeners[message] == nil {
-		return
-	}
-
-	for listener := range *e.listeners[message] {
-		listener.fn()
 	}
 }

pkg/emitter/listener.go

@@ -0,0 +1,19 @@
+package emitter
+
+type Listener[E comparable] interface {
+	Kind() E
+	Run()
+}
+
+type BaseListener[E comparable] struct {
+	kind E
+	fn   func()
+}
+
+func (l BaseListener[E]) Kind() E {
+	return l.kind
+}
+
+func (l BaseListener[E]) Run() {
+	l.fn()
+}

pkg/expr/expr.go

@@ -0,0 +1,15 @@
+// Package expr provides the abstract Expression interface for all evaluatable
+// expression types in the lambda runtime.
+package expr
+
+import (
+	"fmt"
+)
+
+// Expression is the base interface for all evaluatable expression types.
+// Different evaluation modes (lambda calculus, SKI combinators, typed lambda
+// calculus, etc.) implement this interface with their own concrete types.
+type Expression interface {
+	// The expression should have a human-readable representation.
+	fmt.Stringer
+}

pkg/lambda/expression.go

@@ -1,7 +1,31 @@
 package lambda
 
+import (
+	"git.maximhutz.com/max/lambda/pkg/expr"
+	"git.maximhutz.com/max/lambda/pkg/set"
+)
+
+// Expression is the interface for all lambda calculus expression types.
+// It embeds the general expr.Expression interface for cross-mode compatibility.
 type Expression interface {
-	Accept(Visitor)
+	expr.Expression
+
+	// Substitute replaces all free occurrences of the target variable with the
+	// replacement expression. Alpha-renaming is performed automatically to
+	// avoid variable capture.
+	Substitute(target string, replacement Expression) Expression
+
+	// GetFree returns the set of all free variable names in the expression.
+	// This function does not mutate the input expression.
+	// The returned set is newly allocated and can be modified by the caller.
+	GetFree() set.Set[string]
+
+	// Rename replaces all occurrences of the target variable name with the new name.
+	Rename(target string, newName string) Expression
+
+	// IsFree returns true if the variable name n occurs free in the expression.
+	// This function does not mutate the input expression.
+	IsFree(n string) bool
 }
 
 /** ------------------------------------------------------------------------- */
@@ -11,20 +35,22 @@ type Abstraction struct {
 	body      Expression
 }
 
-func (a *Abstraction) Parameter() string {
+var _ Expression = Abstraction{}
+
+func (a Abstraction) Parameter() string {
 	return a.parameter
 }
 
-func (a *Abstraction) Body() Expression {
+func (a Abstraction) Body() Expression {
 	return a.body
 }
 
-func (a *Abstraction) Accept(v Visitor) {
+func (a Abstraction) String() string {
-	v.VisitAbstraction(a)
+	return "\\" + a.parameter + "." + a.body.String()
 }
 
-func NewAbstraction(parameter string, body Expression) *Abstraction {
+func NewAbstraction(parameter string, body Expression) Abstraction {
-	return &Abstraction{parameter: parameter, body: body}
+	return Abstraction{parameter, body}
 }
 
 /** ------------------------------------------------------------------------- */
@@ -34,44 +60,40 @@ type Application struct {
 	argument    Expression
 }
 
-func (a *Application) Abstraction() Expression {
+var _ Expression = Application{}
+
+func (a Application) Abstraction() Expression {
 	return a.abstraction
 }
 
-func (a *Application) Argument() Expression {
+func (a Application) Argument() Expression {
 	return a.argument
 }
 
-func (a *Application) Accept(v Visitor) {
+func (a Application) String() string {
-	v.VisitApplication(a)
+	return "(" + a.abstraction.String() + " " + a.argument.String() + ")"
 }
 
-func NewApplication(abstraction Expression, argument Expression) *Application {
+func NewApplication(abstraction Expression, argument Expression) Application {
-	return &Application{abstraction: abstraction, argument: argument}
+	return Application{abstraction, argument}
 }
 
 /** ------------------------------------------------------------------------- */
 
 type Variable struct {
-	value string
+	name string
 }
 
-func (v *Variable) Value() string {
+var _ Expression = Variable{}
-	return v.value
+
+func (v Variable) Name() string {
+	return v.name
 }
 
-func (v *Variable) Accept(visitor Visitor) {
+func (v Variable) String() string {
-	visitor.VisitVariable(v)
+	return v.name
 }
 
-func NewVariable(name string) *Variable {
+func NewVariable(name string) Variable {
-	return &Variable{value: name}
+	return Variable{name}
-}
-
-/** ------------------------------------------------------------------------- */
-
-type Visitor interface {
-	VisitAbstraction(*Abstraction)
-	VisitApplication(*Application)
-	VisitVariable(*Variable)
 }

pkg/lambda/generate_name.go

@@ -6,7 +6,9 @@ import (
 	"git.maximhutz.com/max/lambda/pkg/set"
 )
 
-func GenerateFreshName(used *set.Set[string]) string {
+// GenerateFreshName generates a variable name that is not in the used set.
+// This function does not mutate the used set.
+func GenerateFreshName(used set.Set[string]) string {
 	for i := uint64(0); ; i++ {
 		attempt := "_" + string(strconv.AppendUint(nil, i, 10))
 

pkg/lambda/get_free_variables.go

@@ -2,19 +2,18 @@ package lambda
 
 import "git.maximhutz.com/max/lambda/pkg/set"
 
-func GetFreeVariables(e Expression) *set.Set[string] {
+func (e Variable) GetFree() set.Set[string] {
-	switch e := e.(type) {
+	return set.New(e.Name())
-	case *Variable:
+}
-		return set.New(e.value)
+
-	case *Abstraction:
+func (e Abstraction) GetFree() set.Set[string] {
-		vars := GetFreeVariables(e.body)
+	vars := e.Body().GetFree()
-		vars.Remove(e.parameter)
+	vars.Remove(e.Parameter())
-		return vars
+	return vars
-	case *Application:
+}
-		vars := GetFreeVariables(e.abstraction)
+
-		vars.Merge(GetFreeVariables(e.argument))
+func (e Application) GetFree() set.Set[string] {
-		return vars
+	vars := e.Abstraction().GetFree()
-	default:
+	vars.Merge(e.Argument().GetFree())
-		return nil
+	return vars
-	}
 }

pkg/lambda/is_free_variable.go

@@ -1,14 +1,12 @@
 package lambda
 
-func IsFreeVariable(n string, e Expression) bool {
+func (e Variable) IsFree(n string) bool {
-	switch e := e.(type) {
+	return e.Name() == n
-	case *Variable:
+}
-		return e.value == n
+
-	case *Abstraction:
+func (e Abstraction) IsFree(n string) bool {
-		return e.parameter != n && IsFreeVariable(n, e.body)
+	return e.Parameter() != n && e.Body().IsFree(n)
-	case *Application:
+}
-		return IsFreeVariable(n, e.abstraction) || IsFreeVariable(n, e.argument)
+func (e Application) IsFree(n string) bool {
-	default:
+	return e.Abstraction().IsFree(n) || e.Argument().IsFree(n)
-		return false
-	}
 }

pkg/lambda/iterator.go

@@ -1,68 +0,0 @@
-package lambda
-
-type Iterator struct {
-	trace []*Expression
-}
-
-func NewIterator(expr *Expression) *Iterator {
-	return &Iterator{[]*Expression{expr}}
-}
-
-func (i *Iterator) Done() bool {
-	return len(i.trace) == 0
-}
-
-func (i *Iterator) Current() *Expression {
-	if i.Done() {
-		return nil
-	}
-
-	return i.trace[len(i.trace)-1]
-}
-
-func (i *Iterator) Parent() *Expression {
-	if len(i.trace) < 2 {
-		return nil
-	}
-
-	return i.trace[len(i.trace)-2]
-}
-
-func (i *Iterator) Swap(with Expression) {
-	current := i.Current()
-	if current != nil {
-		*current = with
-	}
-}
-
-func (i *Iterator) Back() bool {
-	if i.Done() {
-		return false
-	}
-
-	i.trace = i.trace[:len(i.trace)-1]
-	return true
-}
-
-func (i *Iterator) Next() {
-	switch typed := (*i.Current()).(type) {
-	case *Abstraction:
-		i.trace = append(i.trace, &typed.body)
-	case *Application:
-		i.trace = append(i.trace, &typed.abstraction)
-	case *Variable:
-		for len(i.trace) > 1 {
-			if app, ok := (*i.Parent()).(*Application); ok {
-				if app.abstraction == *i.Current() {
-					i.Back()
-					i.trace = append(i.trace, &app.argument)
-					return
-				}
-			}
-
-			i.Back()
-		}
-
-		i.trace = []*Expression{}
-	}
-}

pkg/lambda/reduce.go

@@ -1,30 +0,0 @@
-package lambda
-
-func IsViable(e *Expression) (*Abstraction, Expression, bool) {
-	if e == nil {
-		return nil, nil, false
-	} else if app, appOk := (*e).(*Application); !appOk {
-		return nil, nil, false
-	} else if fn, fnOk := app.abstraction.(*Abstraction); !fnOk {
-		return nil, nil, false
-	} else {
-		return fn, app.argument, true
-	}
-}
-
-func ReduceAll(e *Expression, step func()) {
-	it := NewIterator(e)
-
-	for !it.Done() {
-		if fn, arg, ok := IsViable(it.Current()); !ok {
-			it.Next()
-		} else {
-			it.Swap(Substitute(fn.body, fn.parameter, arg))
-			step()
-
-			if _, _, ok := IsViable(it.Parent()); ok {
-				it.Back()
-			}
-		}
-	}
-}

pkg/lambda/rename.go

@@ -1,38 +1,28 @@
 package lambda
 
-func Rename(expr Expression, target string, newName string) Expression {
+// Rename replaces all occurrences of the target variable name with the new name.
-	switch e := expr.(type) {
+func (e Variable) Rename(target string, newName string) Expression {
-	case *Variable:
+	if e.Name() == target {
-		if e.value == target {
 		return NewVariable(newName)
 	}
-		return e
 
-	case *Abstraction:
+	return e
-		newParam := e.parameter
+}
-		if e.parameter == target {
+
+func (e Abstraction) Rename(target string, newName string) Expression {
+	newParam := e.Parameter()
+	if e.Parameter() == target {
 		newParam = newName
 	}
 
-		newBody := Rename(e.body, target, newName)
+	newBody := e.Body().Rename(target, newName)
-
-		if newParam == e.parameter && newBody == e.body {
-			return e
-		}
 
 	return NewAbstraction(newParam, newBody)
+}
 
-	case *Application:
+func (e Application) Rename(target string, newName string) Expression {
-		newAbs := Rename(e.abstraction, target, newName)
+	newAbs := e.Abstraction().Rename(target, newName)
-		newArg := Rename(e.argument, target, newName)
+	newArg := e.Argument().Rename(target, newName)
-
-		if newAbs == e.abstraction && newArg == e.argument {
-			return e
-		}
 
 	return NewApplication(newAbs, newArg)
-
-	default:
-		return expr
-	}
 }

pkg/lambda/stringify.go

@@ -1,32 +0,0 @@
-package lambda
-
-import "strings"
-
-type stringifyVisitor struct {
-	builder strings.Builder
-}
-
-func (v *stringifyVisitor) VisitVariable(a *Variable) {
-	v.builder.WriteString(a.value)
-}
-
-func (v *stringifyVisitor) VisitAbstraction(f *Abstraction) {
-	v.builder.WriteRune('\\')
-	v.builder.WriteString(f.parameter)
-	v.builder.WriteRune('.')
-	f.body.Accept(v)
-}
-
-func (v *stringifyVisitor) VisitApplication(c *Application) {
-	v.builder.WriteRune('(')
-	c.abstraction.Accept(v)
-	v.builder.WriteRune(' ')
-	c.argument.Accept(v)
-	v.builder.WriteRune(')')
-}
-
-func Stringify(e Expression) string {
-	b := &stringifyVisitor{builder: strings.Builder{}}
-	e.Accept(b)
-	return b.builder.String()
-}

pkg/lambda/substitute.go

@@ -1,46 +1,35 @@
 package lambda
 
-func Substitute(expr Expression, target string, replacement Expression) Expression {
+func (e Variable) Substitute(target string, replacement Expression) Expression {
-	switch e := expr.(type) {
+	if e.Name() == target {
-	case *Variable:
-		if e.value == target {
 		return replacement
 	}
-		return e
 
-	case *Abstraction:
+	return e
-		if e.parameter == target {
+}
+
+func (e Abstraction) Substitute(target string, replacement Expression) Expression {
+	if e.Parameter() == target {
 		return e
 	}
 
-		body := e.body
+	body := e.Body()
-		param := e.parameter
+	param := e.Parameter()
-		if IsFreeVariable(param, replacement) {
+	if replacement.IsFree(param) {
-			freeVars := GetFreeVariables(replacement)
+		freeVars := replacement.GetFree()
-			freeVars.Merge(GetFreeVariables(body))
+		freeVars.Merge(body.GetFree())
 		freshVar := GenerateFreshName(freeVars)
-			body = Rename(body, param, freshVar)
+		body = body.Rename(param, freshVar)
 		param = freshVar
 	}
 
-		newBody := Substitute(body, target, replacement)
+	newBody := body.Substitute(target, replacement)
-		if newBody == body && param == e.parameter {
-			return e
-		}
-
 	return NewAbstraction(param, newBody)
-
+}
-	case *Application:
+
-		newAbs := Substitute(e.abstraction, target, replacement)
+func (e Application) Substitute(target string, replacement Expression) Expression {
-		newArg := Substitute(e.argument, target, replacement)
+	abs := e.Abstraction().Substitute(target, replacement)
-
+	arg := e.Argument().Substitute(target, replacement)
-		if newAbs == e.abstraction && newArg == e.argument {
+
-			return e
+	return NewApplication(abs, arg)
-		}
-
-		return NewApplication(newAbs, newArg)
-
-	default:
-		return expr
-	}
 }

pkg/normalorder/reduce_once.go

@@ -0,0 +1,34 @@
+package normalorder
+
+import "git.maximhutz.com/max/lambda/pkg/lambda"
+
+func ReduceOnce(e lambda.Expression) (lambda.Expression, bool) {
+	switch e := e.(type) {
+	case lambda.Abstraction:
+		body, reduced := ReduceOnce(e.Body())
+		if reduced {
+			return lambda.NewAbstraction(e.Parameter(), body), true
+		}
+		return e, false
+
+	case lambda.Application:
+		if fn, fnOk := e.Abstraction().(lambda.Abstraction); fnOk {
+			return fn.Body().Substitute(fn.Parameter(), e.Argument()), true
+		}
+
+		abs, reduced := ReduceOnce(e.Abstraction())
+		if reduced {
+			return lambda.NewApplication(abs, e.Argument()), true
+		}
+
+		arg, reduced := ReduceOnce(e.Argument())
+		if reduced {
+			return lambda.NewApplication(e.Abstraction(), arg), true
+		}
+
+		return e, false
+
+	default:
+		return e, false
+	}
+}

pkg/normalorder/runtime.go

@@ -0,0 +1,46 @@
+package normalorder
+
+import (
+	"git.maximhutz.com/max/lambda/pkg/emitter"
+	"git.maximhutz.com/max/lambda/pkg/expr"
+	"git.maximhutz.com/max/lambda/pkg/lambda"
+	"git.maximhutz.com/max/lambda/pkg/runtime"
+)
+
+// NormalOrderReducer implements normal order (leftmost-outermost) reduction
+// for lambda calculus expressions.
+type Runtime struct {
+	emitter.BaseEmitter[runtime.Event]
+	expression lambda.Expression
+}
+
+// NewNormalOrderReducer creates a new normal order reducer.
+func NewRuntime(expression lambda.Expression) *Runtime {
+	return &Runtime{
+		BaseEmitter: *emitter.New[runtime.Event](),
+		expression:  expression,
+	}
+}
+
+// Expression returns the current expression state.
+func (r *Runtime) Expression() expr.Expression {
+	return r.expression
+}
+
+func (r *Runtime) Step() bool {
+	result, done := ReduceOnce(r.expression)
+	r.expression = result
+	return !done
+}
+
+// Reduce performs normal order reduction on a lambda expression.
+// The expression must be a lambda.Expression; other types are returned unchanged.
+func (r *Runtime) Run() {
+	r.Emit(runtime.StartEvent)
+
+	for !r.Step() {
+		r.Emit(runtime.StepEvent)
+	}
+
+	r.Emit(runtime.StopEvent)
+}

pkg/runtime/events.go

@@ -0,0 +1,13 @@
+package runtime
+
+// Event represents lifecycle events during interpretation.
+type Event int
+
+const (
+	// StartEvent is emitted before interpretation begins.
+	StartEvent Event = iota
+	// StepEvent is emitted after each interpretation step.
+	StepEvent
+	// StopEvent is emitted after interpretation completes.
+	StopEvent
+)

pkg/runtime/runtime.go

@@ -0,0 +1,27 @@
+// Package runtime provides the abstract Reducer interface for all expression
+// reduction strategies.
+package runtime
+
+import (
+	"git.maximhutz.com/max/lambda/pkg/emitter"
+	"git.maximhutz.com/max/lambda/pkg/expr"
+)
+
+// Runtime defines the interface for expression reduction strategies.
+// Different evaluation modes (normal order, applicative order, SKI combinators,
+// etc.) implement this interface with their own reduction logic.
+//
+// Runtimes also implement the Emitter interface to allow plugins to observe
+// reduction lifecycle events (Start, Step, Stop).
+type Runtime interface {
+	emitter.Emitter[Event]
+
+	// Run a single step. Returns whether the runtime is complete or not.
+	Step() bool
+
+	// Run until completion.
+	Run()
+
+	// Copy the state of the runtime.
+	Expression() expr.Expression
+}

pkg/set/set.go

@@ -1,10 +1,12 @@
 package set
 
+import "iter"
+
 type Set[T comparable] map[T]bool
 
-func (s *Set[T]) Add(items ...T) {
+func (s Set[T]) Add(items ...T) {
 	for _, item := range items {
-		(*s)[item] = true
+		s[item] = true
 	}
 }
 
@@ -12,14 +14,14 @@ func (s Set[T]) Has(item T) bool {
 	return s[item]
 }
 
-func (s *Set[T]) Remove(items ...T) {
+func (s Set[T]) Remove(items ...T) {
 	for _, item := range items {
-		delete(*s, item)
+		delete(s, item)
 	}
 }
 
-func (s *Set[T]) Merge(o *Set[T]) {
+func (s Set[T]) Merge(o Set[T]) {
-	for item := range *o {
+	for item := range o {
 		s.Add(item)
 	}
 }
@@ -34,8 +36,18 @@ func (s Set[T]) ToList() []T {
 	return list
 }
 
-func New[T comparable](items ...T) *Set[T] {
+func (s Set[T]) Items() iter.Seq[T] {
-	result := &Set[T]{}
+	return func(yield func(T) bool) {
+		for item := range s {
+			if !yield(item) {
+				return
+			}
+		}
+	}
+}
+
+func New[T comparable](items ...T) Set[T] {
+	result := Set[T]{}
 
 	for _, item := range items {
 		result.Add(item)

tests/church_6^6.test

@@ -1,8 +0,0 @@
-0 := \f.\x.x
-inc n := \f x.(f (n f x))
-exp n m := (m n)
-print n := (n F X)
-
-N := (inc (inc (inc (inc (inc (inc 0))))))
-
-(print (exp N N))