changed where to closure

Author: leogdion

Examples/Completed/for_loops/dsl.swift

@@ -39,12 +39,14 @@ Group {
       }
     Variable(.let, name: "numbers", equals: Literal.array([Literal.integer(1), Literal.integer(2), Literal.integer(3), Literal.integer(4), Literal.integer(5), Literal.integer(6), Literal.integer(7), Literal.integer(8), Literal.integer(9), Literal.integer(10)]))
 
-    For(VariableExp("number"), in: VariableExp("numbers"), where: Infix("==") {
-        Infix("%") {
-            VariableExp("number")
-            Literal.integer(2)
+    For(VariableExp("number"), in: VariableExp("numbers"), where: {
+        Infix("==") {
+            Infix("%") {
+                VariableExp("number")
+                Literal.integer(2)
+            }
+            Literal.integer(0)
         }
-        Literal.integer(0)
     }, then: {
         Call("print") {
             ParameterExp(unlabeled: "\"Even number: \\(number)\"")

Sources/SyntaxKit/For.swift

@@ -40,17 +40,18 @@ public struct For: CodeBlock {
   /// - Parameters:
   ///   - pattern: A `CodeBlock` that also conforms to `PatternConvertible` for the loop variable(s).
   ///   - sequence: A `CodeBlock` that produces the sequence to iterate over.
-  ///   - whereClause: An optional `CodeBlock` that produces the where clause condition.
+  ///   - whereClause: An optional `CodeBlockBuilder` that produces the where clause condition.
   ///   - then: A ``CodeBlockBuilder`` that provides the body of the loop.
   public init(
     _ pattern: any CodeBlock & PatternConvertible,
     in sequence: CodeBlock,
-    where whereClause: CodeBlock? = nil,
+    @CodeBlockBuilderResult where whereClause: () -> [CodeBlock] = { [] },
     @CodeBlockBuilderResult then: () -> [CodeBlock]
   ) {
     self.pattern = pattern
     self.sequence = sequence
-    self.whereClause = whereClause
+    let whereBlocks = whereClause()
+    self.whereClause = whereBlocks.isEmpty ? nil : whereBlocks[0]
     self.body = then()
   }
 

Tests/SyntaxKitTests/Integration/ForLoopsExampleTests.swift

@@ -64,18 +64,21 @@ import Testing
 
       For(
         VariableExp("number"), in: VariableExp("numbers"),
-        where: Infix("==") {
-          Infix("%") {
-            VariableExp("number")
-            Literal.integer(2)
+        where: {
+          Infix("==") {
+            Infix("%") {
+              VariableExp("number")
+              Literal.integer(2)
+            }
+            Literal.integer(0)
           }
-          Literal.integer(0)
         },
         then: {
           Call("print") {
             ParameterExp(unlabeled: "\"Even number: \\(number)\"")
           }
-        })
+        }
+      )
 
       // MARK: - For-in with Dictionary
       Call("print") {

Tests/SyntaxKitTests/Unit/BasicTests.swift

@@ -57,9 +57,11 @@ final class ForLoopTests {
     let forLoop = For(
       VariableExp("number"),
       in: VariableExp("numbers"),
-      where: Infix("%") {
-        VariableExp("number")
-        Literal.integer(2)
+      where: {
+        Infix("%") {
+          VariableExp("number")
+          Literal.integer(2)
+        }
       },
       then: {
         Call("print") {