fix: no log errors

This commit is contained in:
2025-12-27 01:18:52 -05:00
parent a05a63627e
commit 5841023dde
2 changed files with 0 additions and 25 deletions

View File

@@ -3,7 +3,6 @@ package saccharine
import ( import (
"errors" "errors"
"fmt" "fmt"
"log/slog"
"git.maximhutz.com/max/lambda/pkg/iterator" "git.maximhutz.com/max/lambda/pkg/iterator"
"git.maximhutz.com/max/lambda/pkg/saccharine/ast" "git.maximhutz.com/max/lambda/pkg/saccharine/ast"
@@ -26,24 +25,18 @@ func parseToken(i *TokenIterator, expected token.Type) (*token.Token, error) {
} }
func parseExpression(i *TokenIterator) (ast.Expression, error) { func parseExpression(i *TokenIterator) (ast.Expression, error) {
slog.Info("attempt exp", "index", i.Index())
if abs, absErr := parseAbstraction(i); absErr == nil { if abs, absErr := parseAbstraction(i); absErr == nil {
slog.Info("got exp")
return abs, nil return abs, nil
} else if atm, atmErr := parseApplication(i); atmErr == nil { } else if atm, atmErr := parseApplication(i); atmErr == nil {
slog.Info("got exp")
return atm, nil return atm, nil
} else if app, appErr := parseAtom(i); appErr == nil { } else if app, appErr := parseAtom(i); appErr == nil {
slog.Info("got exp")
return app, nil return app, nil
} else { } else {
slog.Info("fail exp")
return nil, errors.Join(absErr, appErr, atmErr) return nil, errors.Join(absErr, appErr, atmErr)
} }
} }
func parseParameters(i *TokenIterator) ([]string, error) { func parseParameters(i *TokenIterator) ([]string, error) {
slog.Info("parse param")
i2 := i.Copy() i2 := i.Copy()
variables := []string{} variables := []string{}
@@ -55,41 +48,32 @@ func parseParameters(i *TokenIterator) ([]string, error) {
} }
} }
slog.Info("got exp")
i.Sync(i2) i.Sync(i2)
return variables, nil return variables, nil
} }
func parseAbstraction(i *TokenIterator) (*ast.Abstraction, error) { func parseAbstraction(i *TokenIterator) (*ast.Abstraction, error) {
slog.Info("attempt abs")
i2 := i.Copy() i2 := i.Copy()
if _, err := parseToken(i2, token.Slash); err != nil { if _, err := parseToken(i2, token.Slash); err != nil {
slog.Info("fail abs")
return nil, err return nil, err
} else if parameters, err := parseParameters(i2); err != nil { } else if parameters, err := parseParameters(i2); err != nil {
slog.Info("fail abs")
return nil, err return nil, err
} else if _, err = parseToken(i2, token.Dot); err != nil { } else if _, err = parseToken(i2, token.Dot); err != nil {
slog.Info("fail abs")
return nil, err return nil, err
} else if body, err := parseExpression(i2); err != nil { } else if body, err := parseExpression(i2); err != nil {
slog.Info("fail abs")
return nil, err return nil, err
} else { } else {
slog.Info("got abs")
i.Sync(i2) i.Sync(i2)
return ast.NewAbstraction(parameters, body), nil return ast.NewAbstraction(parameters, body), nil
} }
} }
func parseApplication(i *TokenIterator) (*ast.Application, error) { func parseApplication(i *TokenIterator) (*ast.Application, error) {
slog.Info("attempt app")
i2 := i.Copy() i2 := i.Copy()
expressions := []ast.Expression{} expressions := []ast.Expression{}
if _, err := parseToken(i2, token.OpenParen); err != nil { if _, err := parseToken(i2, token.OpenParen); err != nil {
slog.Info("fail app")
return nil, err return nil, err
} }
@@ -102,27 +86,21 @@ func parseApplication(i *TokenIterator) (*ast.Application, error) {
} }
if _, err := parseToken(i2, token.CloseParen); err != nil { if _, err := parseToken(i2, token.CloseParen); err != nil {
slog.Info("fail app")
return nil, err return nil, err
} }
if len(expressions) == 0 { if len(expressions) == 0 {
slog.Info("fail app")
return nil, fmt.Errorf("application has no arguments") return nil, fmt.Errorf("application has no arguments")
} }
slog.Info("got app")
i.Sync(i2) i.Sync(i2)
return ast.NewApplication(expressions[0], expressions[1:]), nil return ast.NewApplication(expressions[0], expressions[1:]), nil
} }
func parseAtom(i *TokenIterator) (*ast.Atom, error) { func parseAtom(i *TokenIterator) (*ast.Atom, error) {
slog.Info("attempt atm")
if tok, err := parseToken(i, token.Atom); err != nil { if tok, err := parseToken(i, token.Atom); err != nil {
slog.Info("fail atm")
return nil, err return nil, err
} else { } else {
slog.Info("got atm")
return ast.NewAtom(tok.Value), nil return ast.NewAtom(tok.Value), nil
} }
} }

View File

@@ -3,7 +3,6 @@ package saccharine
import ( import (
"errors" "errors"
"fmt" "fmt"
"log/slog"
"unicode" "unicode"
"git.maximhutz.com/max/lambda/pkg/iterator" "git.maximhutz.com/max/lambda/pkg/iterator"
@@ -79,10 +78,8 @@ func GetTokens(input []rune) (*iterator.Iterator[token.Token], error) {
for !i.Done() { for !i.Done() {
token, err := getToken(i) token, err := getToken(i)
if err != nil { if err != nil {
slog.Info("token error", "error", err)
errorList = append(errorList, err) errorList = append(errorList, err)
} else if token != nil { } else if token != nil {
slog.Info("token parsed", "token", token)
tokens = append(tokens, *token) tokens = append(tokens, *token)
} }
} }