Use type-aware iteration in script for-loop (GH issue #436)HEADmaster

1 files changed, 6 insertions, 3 deletions

diff --git a/libbuild2/variable.cxx b/libbuild2/variable.cxx
index fb9e840..0ec23d3 100644
--- a/libbuild2/variable.cxx
+++ b/libbuild2/variable.cxx
@@ -2122,9 +2122,9 @@ namespace build2
     return r;
   }
 
-  static void
+  static bool
   json_iterate (const value& val,
-                const function<void (value&&, bool first)>& f)
+                const function<bool (value&&, bool first)>& f)
   {
     // Implement in terms of subscript for consistency (in particular,
     // iterating over simple values like number, string).
@@ -2136,8 +2136,11 @@ namespace build2
       if (!e.second)
         break;
 
-      f (move (e.first), i == 0);
+      if (!f (move (e.first), i == 0))
+        return false;
     }
+
+    return true;
   }
 
   const json_value value_traits<json_value>::empty_instance;