feat: better error messages

pkg/saccharine/parser.go

@@ -1,12 +1,12 @@
 package saccharine
 
 import (
-	"errors"
 	"fmt"
 
 	"git.maximhutz.com/max/lambda/pkg/iterator"
 	"git.maximhutz.com/max/lambda/pkg/saccharine/ast"
 	"git.maximhutz.com/max/lambda/pkg/saccharine/token"
+	"git.maximhutz.com/max/lambda/pkg/trace"
 )
 
 type TokenIterator = iterator.Iterator[token.Token]
@@ -25,15 +25,22 @@ func parseToken(i *TokenIterator, expected token.Type) (*token.Token, error) {
 }
 
 func parseExpression(i *TokenIterator) (ast.Expression, error) {
-	if abs, absErr := parseAbstraction(i); absErr == nil {
-		return abs, nil
-	} else if atm, atmErr := parseApplication(i); atmErr == nil {
-		return atm, nil
-	} else if app, appErr := parseAtom(i); appErr == nil {
-		return app, nil
-	} else {
-		return nil, errors.Join(absErr, appErr, atmErr)
+	var err error
+	var exp ast.Expression
+	peek := i.MustGet()
+
+	switch peek.Type {
+	case token.OpenParen:
+		exp, err = parseApplication(i)
+	case token.Slash:
+		exp, err = parseAbstraction(i)
+	case token.Atom:
+		exp, err = parseAtom(i)
+	default:
+		return nil, fmt.Errorf("expected expression, got '%v' (col %d)", peek.Value, peek.Index)
 	}
+
+	return exp, err
 }
 
 func parseParameters(i *TokenIterator) ([]string, error) {
@@ -56,11 +63,11 @@ func parseAbstraction(i *TokenIterator) (*ast.Abstraction, error) {
 	i2 := i.Copy()
 
 	if _, err := parseToken(i2, token.Slash); err != nil {
-		return nil, fmt.Errorf("no function slash (col %d): %w", i2.MustGet().Index, err)
+		return nil, trace.WrapError(fmt.Errorf("no function slash (col %d)", i2.MustGet().Index), err)
 	} else if parameters, err := parseParameters(i2); err != nil {
 		return nil, err
 	} else if _, err = parseToken(i2, token.Dot); err != nil {
-		return nil, fmt.Errorf("no function dot (col %d): %w", i2.MustGet().Index, err)
+		return nil, trace.WrapError(fmt.Errorf("no function dot (col %d)", i2.MustGet().Index), err)
 	} else if body, err := parseExpression(i2); err != nil {
 		return nil, err
 	} else {
@@ -74,11 +81,14 @@ func parseApplication(i *TokenIterator) (*ast.Application, error) {
 	expressions := []ast.Expression{}
 
 	if _, err := parseToken(i2, token.OpenParen); err != nil {
-		return nil, fmt.Errorf("no openning brackets (col %d): %w", i2.MustGet().Index, err)
+		return nil, trace.WrapError(fmt.Errorf("no openning brackets (col %d)", i2.MustGet().Index), err)
 	}
 
 	for {
 		if exp, err := parseExpression(i2); err != nil {
+			if len(expressions) == 0 {
+				return nil, trace.WrapError(fmt.Errorf("application has no arguments"), err)
+			}
 			break
 		} else {
 			expressions = append(expressions, exp)
@@ -86,11 +96,7 @@ func parseApplication(i *TokenIterator) (*ast.Application, error) {
 	}
 
 	if _, err := parseToken(i2, token.CloseParen); err != nil {
-		return nil, fmt.Errorf("no closing brackets (col %d): %w", i2.MustGet().Index, err)
-	}
-
-	if len(expressions) == 0 {
-		return nil, fmt.Errorf("application has no arguments")
+		return nil, trace.WrapError(fmt.Errorf("no closing brackets (col %d)", i2.MustGet().Index), err)
 	}
 
 	i.Sync(i2)
@@ -99,7 +105,7 @@ func parseApplication(i *TokenIterator) (*ast.Application, error) {
 
 func parseAtom(i *TokenIterator) (*ast.Atom, error) {
 	if tok, err := parseToken(i, token.Atom); err != nil {
-		return nil, fmt.Errorf("no variable (col %d): %w", i.Index(), err)
+		return nil, trace.WrapError(fmt.Errorf("no variable (col %d)", i.Index()), err)
 	} else {
 		return ast.NewAtom(tok.Value), nil
 	}

pkg/saccharine/token/token.go

@@ -4,26 +4,19 @@ package token
 type Type int
 
 const (
-	// Denotes the '(' token.
-	OpenParen Type = iota
-	// Denotes the ')' token.
-	CloseParen
-	// Denotes an alpha-numeric variable.
-	Atom
-	// Denotes the '/' token.
-	Slash
-	// Denotes the '.' token.
-	Dot
+	OpenParen  Type = iota // Denotes the '(' token.
+	CloseParen             // Denotes the ')' token.
+	Atom                   // Denotes an alpha-numeric variable.
+	Slash                  // Denotes the '/' token.
+	Dot                    // Denotes the '.' token.
+	Newline                // Denotes a new-line.
 )
 
 // A representation of a token in source code.
 type Token struct {
-	// Where the token begins in the source text.
-	Index int
-	// What type the token is.
-	Type Type
-	// The value of the token.
-	Value string
+	Index int    // Where the token begins in the source text.
+	Type  Type   // What type the token is.
+	Value string // The value of the token.
 }
 
 func NewOpenParen(index int) *Token {
@@ -46,6 +39,10 @@ func NewAtom(name string, index int) *Token {
 	return &Token{Type: Atom, Index: index, Value: name}
 }
 
+func NewNewline(index int) *Token {
+	return &Token{Type: Newline, Index: index, Value: "\\n"}
+}
+
 func Name(typ Type) string {
 	switch typ {
 	case OpenParen:
@@ -58,6 +55,8 @@ func Name(typ Type) string {
 		return "."
 	case Atom:
 		return "ATOM"
+	case Newline:
+		return "\\n"
 	default:
 		return "?"
 	}

pkg/saccharine/tokenizer.go

@@ -7,6 +7,7 @@ import (
 
 	"git.maximhutz.com/max/lambda/pkg/iterator"
 	"git.maximhutz.com/max/lambda/pkg/saccharine/token"
+	"git.maximhutz.com/max/lambda/pkg/trace"
 )
 
 // isVariables determines whether a rune can be a valid variable.
@@ -38,7 +39,7 @@ func getToken(i *iterator.Iterator[rune]) (*token.Token, error) {
 
 	letter, err := i.Next()
 	if err != nil {
-		return nil, fmt.Errorf("cannot produce next token: %w", err)
+		return nil, trace.WrapError(fmt.Errorf("cannot produce next token"), err)
 	}
 
 	switch {
@@ -50,6 +51,8 @@ func getToken(i *iterator.Iterator[rune]) (*token.Token, error) {
 		return token.NewDot(index), nil
 	case letter == '\\':
 		return token.NewSlash(index), nil
+	case letter == '\n':
+		return token.NewNewline(index), nil
 	case unicode.IsSpace(letter):
 		return nil, nil
 	case isVariable(letter):