feat: new system

cmd/lambda/lambda.go

@@ -1,14 +1,11 @@
 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/plugins"
-	"git.maximhutz.com/max/lambda/pkg/convert"
-	"git.maximhutz.com/max/lambda/pkg/normalorder"
-	"git.maximhutz.com/max/lambda/pkg/saccharine"
 )
 
 func main() {
@@ -20,48 +17,42 @@ func main() {
 	logger.Info("using program arguments", "args", os.Args)
 	logger.Info("parsed CLI options", "options", options)
 
+	r := GetRegistry()
+	fmt.Println(1)
 	// Get input.
 	input, err := options.Source.Extract()
 	cli.HandleError(err)
+	fmt.Println(2)
 
 	// Parse code into syntax tree.
-	ast, err := saccharine.Parse(input)
+	repr, err := r.Unmarshal(input, "saccharine")
 	cli.HandleError(err)
-	logger.Info("parsed syntax tree", "tree", ast)
+	logger.Info("parsed syntax tree", "tree", repr)
 
+	fmt.Println(3)
 	// Compile expression to lambda calculus.
-	compiled := convert.SaccharineToLambda(ast)
-	logger.Info("compiled λ expression", "tree", compiled.String())
-
+	compiled, err := r.ConvertTo(repr, "lambda")
+	cli.HandleError(err)
+	logger.Info("compiled λ expression", "tree", compiled)
+	fmt.Println(4)
 	// Create reducer with the compiled expression.
-	runtime := normalorder.NewRuntime(compiled)
-
-	// If the user selected to track CPU performance, attach a profiler.
-	if options.Profile != "" {
-		plugins.NewPerformance(options.Profile, runtime)
-	}
-
-	// If the user selected to produce a step-by-step explanation, attach an
-	// observer.
-	if options.Explanation {
-		plugins.NewExplanation(runtime)
-	}
-
-	// If the user opted to track statistics, attach a tracker.
-	if options.Statistics {
-		plugins.NewStatistics(runtime)
-	}
-
-	// If the user selected for verbose debug logs, attach a reduction tracker.
-	if options.Verbose {
-		plugins.NewLogs(logger, runtime)
-	}
+	engine, err := r.GetDefaultEngine("lambda")
+	cli.HandleError(err)
+	fmt.Println(5)
 
+	err = engine.Set(compiled)
+	cli.HandleError(err)
 	// Run reduction.
-	runtime.Run()
-
+	for engine.Step(1) {
+	}
+	fmt.Println(6)
 	// Return the final reduced result.
-	result := runtime.Expression().String()
-	err = options.Destination.Write(result)
+	result, err := engine.Get()
+	cli.HandleError(err)
+	fmt.Println(7, result)
+	output, err := r.Marshal(result)
+	cli.HandleError(err)
+	fmt.Println(8)
+	err = options.Destination.Write(output)
 	cli.HandleError(err)
 }

cmd/lambda/lambda_test.go

@@ -1,85 +0,0 @@
-package main
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"git.maximhutz.com/max/lambda/pkg/convert"
-	"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 runtime.
-func runSample(samplePath string) (string, error) {
-	// Read the sample file.
-	input, err := os.ReadFile(samplePath)
-	if err != nil {
-		return "", err
-	}
-
-	// Parse code into syntax tree.
-	ast, err := saccharine.Parse(string(input))
-	if err != nil {
-		return "", err
-	}
-
-	// Compile expression to lambda calculus.
-	compiled := convert.SaccharineToLambda(ast)
-
-	// Create and run the reducer.
-	reducer := normalorder.NewRuntime(compiled)
-	reducer.Run()
-
-	return reducer.Expression().String() + "\n", nil
-}
-
-// Test that all samples produce expected output.
-func TestSamplesValidity(t *testing.T) {
-	// Discover all .test files in the tests directory.
-	testFiles, err := filepath.Glob("../../tests/*.test")
-	assert.NoError(t, err, "Failed to read tests directory.")
-	assert.NotEmpty(t, testFiles, "No '*.test' files found in directory.")
-
-	for _, testPath := range testFiles {
-		// Build expected file path.
-		expectedPath := strings.TrimSuffix(testPath, filepath.Ext(testPath)) + ".expected"
-
-		name := strings.TrimSuffix(filepath.Base(testPath), filepath.Ext(testPath))
-
-		t.Run(name, func(t *testing.T) {
-			// Run the sample and capture output.
-			actual, err := runSample(testPath)
-			assert.NoError(t, err, "Failed to run sample.")
-
-			// Read expected output.
-			expectedBytes, err := os.ReadFile(expectedPath)
-			assert.NoError(t, err, "Failed to read expected output.")
-			expected := string(expectedBytes)
-
-			// Compare outputs.
-			assert.Equal(t, expected, actual, "Output does not match expected.")
-		})
-	}
-}
-
-// Benchmark all samples using sub-benchmarks.
-func BenchmarkSamples(b *testing.B) {
-	// Discover all .test files in the tests directory.
-	testFiles, err := filepath.Glob("../../tests/*.test")
-	assert.NoError(b, err, "Failed to read tests directory.")
-	assert.NotEmpty(b, testFiles, "No '*.test' files found in directory.")
-
-	for _, path := range testFiles {
-		name := strings.TrimSuffix(filepath.Base(path), filepath.Ext(path))
-
-		b.Run(name, func(b *testing.B) {
-			for b.Loop() {
-				_, err := runSample(path)
-				assert.NoError(b, err, "Failed to run sample.")
-			}
-		})
-	}
-}

cmd/lambda/registry.go

@@ -9,14 +9,14 @@ import (
 	"git.maximhutz.com/max/lambda/pkg/saccharine"
 )
 
-func MakeRegistry() *registry.Registry {
+func GetRegistry() *registry.Registry {
 	r := registry.New()
 
 	// Codecs
-	r.AddCodec(cli.ConvertCodec(convert.Saccharine2Lambda{}, "saccharine", "lambda"))
+	r.AddConversions(cli.ConvertCodec(convert.Saccharine2Lambda{}, "saccharine", "lambda")...)
 
 	// Engines
-	r.AddEngine(cli.ConvertEngine(normalorder.Engine{}, "normalorder", "lambda"))
+	r.AddEngine(cli.ConvertEngine(&normalorder.Engine{}, "normalorder", "lambda"))
 
 	// Marshalers
 	r.AddMarshaler(cli.ConvertMarshaler(lambda.Marshaler{}, "lambda"))