style: moved functions around

This commit is contained in:
2025-12-30 15:58:14 -05:00
parent 412d3924eb
commit 2499921679
10 changed files with 115 additions and 93 deletions

View File

@@ -4,14 +4,14 @@ import (
"fmt"
"git.maximhutz.com/max/lambda/pkg/lambda"
"git.maximhutz.com/max/lambda/pkg/saccharine/ast"
"git.maximhutz.com/max/lambda/pkg/saccharine"
)
func convertAtom(n *ast.Atom) lambda.Expression {
func convertAtom(n *saccharine.Atom) lambda.Expression {
return lambda.NewVariable(n.Name)
}
func convertAbstraction(n *ast.Abstraction) lambda.Expression {
func convertAbstraction(n *saccharine.Abstraction) lambda.Expression {
result := SaccharineToLambda(n.Body)
parameters := n.Parameters
@@ -31,7 +31,7 @@ func convertAbstraction(n *ast.Abstraction) lambda.Expression {
return result
}
func convertApplication(n *ast.Application) lambda.Expression {
func convertApplication(n *saccharine.Application) lambda.Expression {
result := SaccharineToLambda(n.Abstraction)
arguments := []lambda.Expression{}
@@ -47,13 +47,13 @@ func convertApplication(n *ast.Application) lambda.Expression {
return result
}
func reduceLet(s *ast.LetStatement, e lambda.Expression) lambda.Expression {
func reduceLet(s *saccharine.LetStatement, e lambda.Expression) lambda.Expression {
var value lambda.Expression
if len(s.Parameters) == 0 {
value = SaccharineToLambda(s.Body)
} else {
value = convertAbstraction(ast.NewAbstraction(s.Parameters, s.Body))
value = convertAbstraction(saccharine.NewAbstraction(s.Parameters, s.Body))
}
return lambda.NewApplication(
@@ -62,7 +62,7 @@ func reduceLet(s *ast.LetStatement, e lambda.Expression) lambda.Expression {
)
}
func reduceDeclare(s *ast.DeclareStatement, e lambda.Expression) lambda.Expression {
func reduceDeclare(s *saccharine.DeclareStatement, e lambda.Expression) lambda.Expression {
freshVar := lambda.GenerateFreshName(lambda.GetFreeVariables(e))
return lambda.NewApplication(
@@ -71,18 +71,18 @@ func reduceDeclare(s *ast.DeclareStatement, e lambda.Expression) lambda.Expressi
)
}
func reduceStatement(s ast.Statement, e lambda.Expression) lambda.Expression {
func reduceStatement(s saccharine.Statement, e lambda.Expression) lambda.Expression {
switch s := s.(type) {
case *ast.DeclareStatement:
case *saccharine.DeclareStatement:
return reduceDeclare(s, e)
case *ast.LetStatement:
case *saccharine.LetStatement:
return reduceLet(s, e)
default:
panic(fmt.Errorf("unknown statement type: %v", s))
}
}
func convertClause(n *ast.Clause) lambda.Expression {
func convertClause(n *saccharine.Clause) lambda.Expression {
result := SaccharineToLambda(n.Returns)
for i := len(n.Statements) - 1; i >= 0; i-- {
@@ -92,15 +92,15 @@ func convertClause(n *ast.Clause) lambda.Expression {
return result
}
func SaccharineToLambda(n ast.Expression) lambda.Expression {
func SaccharineToLambda(n saccharine.Expression) lambda.Expression {
switch n := n.(type) {
case *ast.Atom:
case *saccharine.Atom:
return convertAtom(n)
case *ast.Abstraction:
case *saccharine.Abstraction:
return convertAbstraction(n)
case *ast.Application:
case *saccharine.Application:
return convertApplication(n)
case *ast.Clause:
case *saccharine.Clause:
return convertClause(n)
default:
panic(fmt.Errorf("unknown expression type: %T", n))