Merge remote-tracking branch 'upstream/master' into feat/disable-env-builtin

Author: boinger

compiler/compiler.go

@@ -1213,12 +1213,14 @@ func (c *compiler) emitLoopBackwards(body func()) {
 	c.emit(OpInt, 0)
 	c.emit(OpMoreOrEqual)
 	end := c.emit(OpJumpIfFalse, placeholder)
+	c.emit(OpPop)
 
 	body()
 
 	c.emit(OpDecrementIndex)
 	c.emit(OpJumpBackward, c.calcBackwardJump(begin))
 	c.patchJump(end)
+	c.emit(OpPop)
 }
 
 func (c *compiler) PredicateNode(node *ast.PredicateNode) {

expr_test.go

@@ -1275,6 +1275,22 @@ func TestExpr(t *testing.T) {
 			`findLastIndex(1..9, # % 2 == 0)`,
 			7,
 		},
+		{
+			`{"r": findLast([1, 2, 3, 4, 5], # > 3)}`,
+			map[string]any{"r": 5},
+		},
+		{
+			`{"r": findLastIndex([1, 2, 3, 4, 5], # > 3)}`,
+			map[string]any{"r": 4},
+		},
+		{
+			`{"r": findLast([1, 2, 3], # > 10)}`,
+			map[string]any{"r": nil},
+		},
+		{
+			`{"a": findLast([1, 2, 3], # > 1), "b": findLastIndex([4, 5, 6], # > 4)}`,
+			map[string]any{"a": 3, "b": 2},
+		},
 		{
 			`filter(1..9, # % 2 == 0)[-1]`,
 			8,