Properly handle incorrect lambdas

MCDevKit · May 17, 2024 · e213be5 · e213be5
1 parent ca30569
commit e213be5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/jsonte/evaluator.go b/jsonte/evaluator.go
@@ -129,7 +129,7 @@ func ParseLambda(text string) ([]string, []string, error) {
 	p.BuildParseTrees = true
 	tree := p.Lambda()
 	if listener.Error != nil {
-		return nil, nil, burrito.WrapErrorf(listener.Error, "Failed to parse expression \"%s\"", text)
+		return nil, nil, burrito.WrapErrorf(listener.Error, "Failed to parse lambda \"%s\"", text)
 	}
 	visitor := LambdaVisitor{}
 	visitor.Visit(tree)

diff --git a/jsonte/expression_visitor.go b/jsonte/expression_visitor.go
@@ -768,7 +768,10 @@ func (v *ExpressionVisitor) VisitObject_field(context *parser.Object_fieldContex
 }
 
 func (v *ExpressionVisitor) VisitLambda(ctx *parser.LambdaContext) (types.JsonType, error) {
-	vars, args, _ := ParseLambda(ctx.GetText())
+	vars, args, err := ParseLambda(ctx.GetText())
+	if err != nil {
+		return types.Null, burrito.PassError(err)
+	}
 	return types.NewLambda(
 		func(this *types.JsonLambda, o []types.JsonType) (types.JsonType, error) {
 			if len(ctx.AllName()) > len(o) {