Preserve loop call-boundary errors for property setters

Author: mgomes

vibes/execution.go

@@ -382,6 +382,14 @@ func (exec *Execution) assignToMember(obj Value, property string, value Value, p
 			return exec.errorAt(pos, "private method %s", setterName)
 		}
 		_, err := exec.callFunction(fn, obj, []Value{value}, nil, NewNil(), pos)
+		if err != nil {
+			if errors.Is(err, errLoopBreak) {
+				return exec.errorAt(pos, "break cannot cross call boundary")
+			}
+			if errors.Is(err, errLoopNext) {
+				return exec.errorAt(pos, "next cannot cross call boundary")
+			}
+		}
 		return err
 	}
 

vibes/runtime_test.go

@@ -1007,6 +1007,20 @@ func TestLoopControlBreakAndNext(t *testing.T) {
 
 func TestLoopControlNestedAndBlockBoundaryBehavior(t *testing.T) {
 	script := compileScript(t, `
+    class SetterBoundary
+      def break_set=(n)
+        if n == 2
+          break
+        end
+      end
+
+      def next_set=(n)
+        if n == 2
+          next
+        end
+      end
+    end
+
     def nested_break()
       out = []
       for i in [1, 2]
@@ -1060,6 +1074,22 @@ func TestLoopControlNestedAndBlockBoundaryBehavior(t *testing.T) {
       end
       out
     end
+
+    def break_from_setter_boundary()
+      target = SetterBoundary.new
+      for n in [1, 2, 3]
+        target.break_set = n
+      end
+      true
+    end
+
+    def next_from_setter_boundary()
+      target = SetterBoundary.new
+      for n in [1, 2, 3]
+        target.next_set = n
+      end
+      true
+    end
     `)
 
 	nestedBreak := callFunc(t, script, "nested_break", nil)
@@ -1077,6 +1107,16 @@ func TestLoopControlNestedAndBlockBoundaryBehavior(t *testing.T) {
 	if err == nil || !strings.Contains(err.Error(), "next cannot cross call boundary") {
 		t.Fatalf("expected block-boundary next error, got %v", err)
 	}
+
+	_, err = script.Call(context.Background(), "break_from_setter_boundary", nil, CallOptions{})
+	if err == nil || !strings.Contains(err.Error(), "break cannot cross call boundary") {
+		t.Fatalf("expected setter-boundary break error, got %v", err)
+	}
+
+	_, err = script.Call(context.Background(), "next_from_setter_boundary", nil, CallOptions{})
+	if err == nil || !strings.Contains(err.Error(), "next cannot cross call boundary") {
+		t.Fatalf("expected setter-boundary next error, got %v", err)
+	}
 }
 
 func TestLoopControlInsideClassMethods(t *testing.T) {