Make closure brackets optional

Author: antonmedv

parser/parser.go

@@ -374,18 +374,24 @@ func (p *parser) parseIdentifierExpression(token Token) Node {
 }
 
 func (p *parser) parseClosure() Node {
-	token := p.current
-	p.expect(Bracket, "{")
+	startToken := p.current
+	expectClosingBracket := false
+	if p.current.Is(Bracket, "{") {
+		p.next()
+		expectClosingBracket = true
+	}
 
 	p.depth++
 	node := p.parseExpression(0)
 	p.depth--
 
-	p.expect(Bracket, "}")
+	if expectClosingBracket {
+		p.expect(Bracket, "}")
+	}
 	closure := &ClosureNode{
 		Node: node,
 	}
-	closure.SetLocation(token.Location)
+	closure.SetLocation(startToken.Location)
 	return closure
 }
 

parser/parser_test.go

@@ -338,6 +338,16 @@ func TestParse(t *testing.T) {
 			&UnaryNode{Operator: "not",
 				Node: &IdentifierNode{Value: "in_var"}},
 		},
+		{
+			"all(Tickets, #)",
+			&BuiltinNode{
+				Name: "all",
+				Arguments: []Node{
+					&IdentifierNode{Value: "Tickets"},
+					&ClosureNode{
+						Node: &PointerNode{},
+					}}},
+		},
 		{
 			"all(Tickets, {.Price > 0})",
 			&BuiltinNode{