Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement lambda expressions #219

Merged
merged 6 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ast/ast.go
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ type Arg interface {
func (ExprArg) isArg() {}
func (IntervalArg) isArg() {}
func (SequenceArg) isArg() {}
func (LambdaArg) isArg() {}

// NullHandlingModifier represents IGNORE/RESPECT NULLS of aggregate function calls
type NullHandlingModifier interface {
Expand Down Expand Up @@ -1192,6 +1193,19 @@ type SequenceArg struct {
Expr Expr
}

// LambdaArg is lambda expression argument of the generic function call.
//
// {{if .Lparen.Invalid}}{{.Args | sqlJoin ", "}}{{else}}({{.Args | sqlJoin ", "}}) -> {{.Expr | sql}}
type LambdaArg struct {
// pos = Lparen || Args[0].pos
// end = Expr.end

Lparen token.Pos // optional

Args []*Ident
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It may be useful to mention len(Args) == 1 if Lparen.Invalid() here and the above template doc. What do you think?

Copy link
Contributor Author

@apstndb apstndb Dec 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated e5e6033, d021e57

Expr Expr
}

// NamedArg represents a name and value pair in named arguments
//
// {{.Name | sql}} => {{.Value | sql}}
Expand Down
8 changes: 8 additions & 0 deletions ast/pos.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions ast/sql.go
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,14 @@ func (c *CallExpr) SQL() string {
")"
}

func (l *LambdaArg) SQL() string {
return strOpt(!l.Lparen.Invalid(), "(") +
sqlJoin(l.Args, ", ") +
strOpt(!l.Lparen.Invalid(), ")") +
" -> " +
l.Expr.SQL()
}

func (n *NamedArg) SQL() string { return n.Name.SQL() + " => " + n.Value.SQL() }

func (i *IgnoreNulls) SQL() string { return "IGNORE NULLS" }
Expand Down
39 changes: 39 additions & 0 deletions parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -1588,13 +1588,52 @@ func (p *Parser) tryParseNamedArg() *ast.NamedArg {
}
}

func (p *Parser) lookaheadLambdaArg() bool {
lexer := p.Lexer.Clone()
defer func() {
p.Lexer = lexer
}()

if p.Token.Kind != "(" && p.Token.Kind != token.TokenIdent {
return false
}

// Note: all lambda patterns can be parsed as expr -> expr.
p.parseExpr()
return p.Token.Kind == "->"
}

func (p *Parser) parseLambdaArg() *ast.LambdaArg {
lparen := token.InvalidPos
var args []*ast.Ident
if p.Token.Kind == "(" {
lparen = p.expect("(").Pos
args = parseCommaSeparatedList(p, p.parseIdent)
p.expect(")")
} else {
args = []*ast.Ident{p.parseIdent()}
}

p.expect("->")
expr := p.parseExpr()

return &ast.LambdaArg{
Lparen: lparen,
Args: args,
Expr: expr,
}
}

func (p *Parser) parseArg() ast.Arg {
if i := p.tryParseIntervalArg(); i != nil {
return i
}
if s := p.tryParseSequenceArg(); s != nil {
return s
}
if p.lookaheadLambdaArg() {
return p.parseLambdaArg()
}
return p.parseExprArg()
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ARRAY_FILTER([1 ,2, 3], e -> e > 1)
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ARRAY_FILTER([0, 2, 3], (e, i) -> e > i)
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
--- array_functions_array_filter_parenless_lambda.sql
ARRAY_FILTER([1 ,2, 3], e -> e > 1)
--- AST
&ast.CallExpr{
Rparen: 34,
Func: &ast.Ident{
NamePos: 0,
NameEnd: 12,
Name: "ARRAY_FILTER",
},
Distinct: false,
Args: []ast.Arg{
&ast.ExprArg{
Expr: &ast.ArrayLiteral{
Array: -1,
Lbrack: 13,
Rbrack: 21,
Type: nil,
Values: []ast.Expr{
&ast.IntLiteral{
ValuePos: 14,
ValueEnd: 15,
Base: 10,
Value: "1",
},
&ast.IntLiteral{
ValuePos: 17,
ValueEnd: 18,
Base: 10,
Value: "2",
},
&ast.IntLiteral{
ValuePos: 20,
ValueEnd: 21,
Base: 10,
Value: "3",
},
},
},
},
&ast.LambdaArg{
Lparen: -1,
Args: []*ast.Ident{
&ast.Ident{
NamePos: 24,
NameEnd: 25,
Name: "e",
},
},
Expr: &ast.BinaryExpr{
Op: ">",
Left: &ast.Ident{
NamePos: 29,
NameEnd: 30,
Name: "e",
},
Right: &ast.IntLiteral{
ValuePos: 33,
ValueEnd: 34,
Base: 10,
Value: "1",
},
},
},
},
NamedArgs: []*ast.NamedArg(nil),
NullHandling: nil,
Having: nil,
}

--- SQL
ARRAY_FILTER([1, 2, 3], e -> e > 1)
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
--- array_functions_array_filter_two_args_lambda.sql
ARRAY_FILTER([0, 2, 3], (e, i) -> e > i)
--- AST
&ast.CallExpr{
Rparen: 39,
Func: &ast.Ident{
NamePos: 0,
NameEnd: 12,
Name: "ARRAY_FILTER",
},
Distinct: false,
Args: []ast.Arg{
&ast.ExprArg{
Expr: &ast.ArrayLiteral{
Array: -1,
Lbrack: 13,
Rbrack: 21,
Type: nil,
Values: []ast.Expr{
&ast.IntLiteral{
ValuePos: 14,
ValueEnd: 15,
Base: 10,
Value: "0",
},
&ast.IntLiteral{
ValuePos: 17,
ValueEnd: 18,
Base: 10,
Value: "2",
},
&ast.IntLiteral{
ValuePos: 20,
ValueEnd: 21,
Base: 10,
Value: "3",
},
},
},
},
&ast.LambdaArg{
Lparen: 24,
Args: []*ast.Ident{
&ast.Ident{
NamePos: 25,
NameEnd: 26,
Name: "e",
},
&ast.Ident{
NamePos: 28,
NameEnd: 29,
Name: "i",
},
},
Expr: &ast.BinaryExpr{
Op: ">",
Left: &ast.Ident{
NamePos: 34,
NameEnd: 35,
Name: "e",
},
Right: &ast.Ident{
NamePos: 38,
NameEnd: 39,
Name: "i",
},
},
},
},
NamedArgs: []*ast.NamedArg(nil),
NullHandling: nil,
Having: nil,
}

--- SQL
ARRAY_FILTER([0, 2, 3], (e, i) -> e > i)
Loading