pkg/lambda/expression.go

@@ -6,7 +6,6 @@ import "git.maximhutz.com/max/lambda/pkg/expr"
 // It embeds the general expr.Expression interface for cross-mode compatibility.
 type Expression interface {
 	expr.Expression
-	Accept(Visitor)
 }
 
 /** ------------------------------------------------------------------------- */
@@ -24,10 +23,6 @@ func (a *Abstraction) Body() Expression {
 	return a.body
 }
 
-func (a *Abstraction) Accept(v Visitor) {
-	v.VisitAbstraction(a)
-}
-
 func (a *Abstraction) String() string {
 	return Stringify(a)
 }
@@ -51,10 +46,6 @@ func (a *Application) Argument() Expression {
 	return a.argument
 }
 
-func (a *Application) Accept(v Visitor) {
-	v.VisitApplication(a)
-}
-
 func (a *Application) String() string {
 	return Stringify(a)
 }
@@ -73,10 +64,6 @@ func (v *Variable) Value() string {
 	return v.value
 }
 
-func (v *Variable) Accept(visitor Visitor) {
-	visitor.VisitVariable(v)
-}
-
 func (v *Variable) String() string {
 	return Stringify(v)
 }
@@ -84,11 +71,3 @@ func (v *Variable) String() string {
 func NewVariable(name string) *Variable {
 	return &Variable{value: name}
 }
-
-/** ------------------------------------------------------------------------- */
-
-type Visitor interface {
-	VisitAbstraction(*Abstraction)
-	VisitApplication(*Application)
-	VisitVariable(*Variable)
-}

pkg/lambda/stringify.go

@@ -2,31 +2,27 @@ package lambda
 
 import "strings"
 
-type stringifyVisitor struct {
+// Stringify converts a lambda calculus expression to its string representation.
-	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{}}
+	var builder strings.Builder
-	e.Accept(b)
+	stringify(&builder, e)
-	return b.builder.String()
+	return builder.String()
+}
+
+func stringify(b *strings.Builder, e Expression) {
+	switch e := e.(type) {
+	case *Variable:
+		b.WriteString(e.value)
+	case *Abstraction:
+		b.WriteRune('\\')
+		b.WriteString(e.parameter)
+		b.WriteRune('.')
+		stringify(b, e.body)
+	case *Application:
+		b.WriteRune('(')
+		stringify(b, e.abstraction)
+		b.WriteRune(' ')
+		stringify(b, e.argument)
+		b.WriteRune(')')
+	}
 }