feat: no constructors for expressions and statements for saccharine
This commit is contained in:
@@ -83,7 +83,7 @@ func parseAbstraction(i *TokenIterator) (*Abstraction, error) {
|
||||
} else if body, err := parseExpression(i); err != nil {
|
||||
return nil, err
|
||||
} else {
|
||||
return NewAbstraction(parameters, body), nil
|
||||
return &Abstraction{Parameters: parameters, Body: body}, nil
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -97,7 +97,7 @@ func parseApplication(i *TokenIterator) (*Application, error) {
|
||||
} else if _, err := parseToken(i, TokenCloseParen, true); err != nil {
|
||||
return nil, fmt.Errorf("no closing brackets (col %d): %w", i.MustGet().Column, err)
|
||||
} else {
|
||||
return NewApplication(expressions[0], expressions[1:]), nil
|
||||
return &Application{Abstraction: expressions[0], Arguments: expressions[1:]}, nil
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -106,7 +106,7 @@ func parseAtom(i *TokenIterator) (*Atom, error) {
|
||||
if tok, err := parseToken(i, TokenAtom, true); err != nil {
|
||||
return nil, fmt.Errorf("no variable (col %d): %w", i.Index(), err)
|
||||
} else {
|
||||
return NewAtom(tok.Value), nil
|
||||
return &Atom{Name: tok.Value}, nil
|
||||
}
|
||||
}
|
||||
|
||||
@@ -155,7 +155,7 @@ func parseClause(i *TokenIterator, braces bool) (*Clause, error) {
|
||||
}
|
||||
}
|
||||
|
||||
return NewClause(stmts[:len(stmts)-1], last.Value), nil
|
||||
return &Clause{Statements: stmts[:len(stmts)-1], Returns: last.Value}, nil
|
||||
}
|
||||
|
||||
func parseExpression(i *TokenIterator) (Expression, error) {
|
||||
@@ -186,7 +186,7 @@ func parseLet(i *TokenIterator) (*LetStatement, error) {
|
||||
} else if body, err := parseExpression(i); err != nil {
|
||||
return nil, err
|
||||
} else {
|
||||
return NewLet(parameters[0], parameters[1:], body), nil
|
||||
return &LetStatement{Name: parameters[0], Parameters: parameters[1:], Body: body}, nil
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -195,7 +195,7 @@ func parseDeclare(i *TokenIterator) (*DeclareStatement, error) {
|
||||
if value, err := parseExpression(i); err != nil {
|
||||
return nil, err
|
||||
} else {
|
||||
return NewDeclare(value), nil
|
||||
return &DeclareStatement{Value: value}, nil
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user