Change loops help page to control flow

Author: nicklockwood

Help/commands.md

@@ -109,4 +109,4 @@ The default starting value for `seed` is zero, so `seed 0` will cause the `rnd`
 The `debug` and `print` commands can be used to understand what's happening in your script and help diagnose problems. These are documented in the [debugging](debugging.md) section.
 
 ---
-[Index](index.md) | Next: [Loops](loops.md)
+[Index](index.md) | Next: [Control Flow](control-flow.md)

Help/loops.md renamed to Help/control-flow.md

@@ -1,6 +1,8 @@
-Loops
+Control Flow
 ---
 
+## Loops
+
 To repeat an instruction (or sequence of instructions) you can use a `for` loop. The simplest form of the for loop takes a [numeric range](expressions.md#ranges), and a block of instructions inside braces. The following loop creates a circle of 5 points (you might use this inside a `path`):
 
 ```swift

Help/examples.md

@@ -5,19 +5,19 @@ ShapeScript includes a number of example files that demonstrate various features
 
 ## Ball
 
-The Ball example demonstrates how to use the [stencil](csg.md#stencil) command to "paint" patterns on a sphere, as well as a [for loop](loops.md) to generate a star shape that is then [extruded](builders.md#extrude).
+The Ball example demonstrates how to use the [stencil](csg.md#stencil) command to "paint" patterns on a sphere, as well as a [for loop](control-flow.md#loops) to generate a star shape that is then [extruded](builders.md#extrude).
 
 ![Ball](images/ball.png)
 
 ## Chessboard
 
-The Chessboard example demonstrates the use of [for loops](loops.md) to duplicate shapes, along with [paths](paths.md), [lathe builders](builders.md#lathe) and [CSG](csg.md) operations.
+The Chessboard example demonstrates the use of [for loops](control-flow.md#loops) to duplicate shapes, along with [paths](paths.md), [lathe builders](builders.md#lathe) and [CSG](csg.md) operations.
 
 ![Chessboard](images/chessboard.png)
 
 ## Cog
 
-The Cog example demonstrates procedural generation of a complex [path](paths.md) using a [for loop](loops.md), as well as the creation of a custom [block](blocks.md) and the use of the [option](blocks.md#options) command to pass parameters.
+The Cog example demonstrates procedural generation of a complex [path](paths.md) using a [for loop](control-flow.md#loops), as well as the creation of a custom [block](blocks.md) and the use of the [option](blocks.md#options) command to pass parameters.
 
 ![Cog](images/cog.png)
 
@@ -29,7 +29,7 @@ The Earth example demonstrates use of the [texture](materials.md#texture) comman
 
 ## Spring
 
-The Spring example demonstrates advanced use of the [loft](builders.md#loft) command to create a coiled spring shape. This example also demonstrates the use of [for loops](loops.md) and user-defined [options](blocks.md#options).
+The Spring example demonstrates advanced use of the [loft](builders.md#loft) command to create a coiled spring shape. This example also demonstrates the use of [for loops](control-flow.md#loops) and user-defined [options](blocks.md#options).
 
 ![Spring](images/spring.png)
 

Help/expressions.md

@@ -73,7 +73,7 @@ Another type of expression you can create is a *range* expression. This consists
 1 to 5
 ```
 
-Ranges are mostly used in [for loops](loops.md):
+Ranges are mostly used in [for loops](control-flow.md#loops):
 
 ```swift
 for i in 1 to 5 {
@@ -117,7 +117,7 @@ for i in 0 to 1 step 0.2 {
 }
 ```
 
-A negative `step` can be used to create a [backwards loop](loops.md#looping-backwards):
+A negative `step` can be used to create a [backwards loop](control-flow.md#looping-backwards):
 
 ```swift
 for i in 5 to 1 step -1 {

Help/import.md

@@ -9,7 +9,7 @@ import "MyShape.shape"
 
 The `import` command loads an external ShapeScript file and evaluates it inside the calling script. Any symbols that are defined in the imported file will become available inside the [scope](scope.md) in which it is loaded, and any geometry created by the imported file will be displayed.
 
-You can import the same file several times in the same script, and import statements can appear inside [loops](loops.md) or [blocks](blocks.md). If you don't want the geometry inside an imported file to be displayed immediately, you can place the import inside a [define](symbols.md) statement:
+You can import the same file several times in the same script, and import statements can appear inside [loops](control-flow.md#loops) or [blocks](blocks.md). If you don't want the geometry inside an imported file to be displayed immediately, you can place the import inside a [define](symbols.md) statement:
 
 ```swift
 define ball {

Help/index.md

@@ -83,10 +83,11 @@ ShapeScript Help
         - [Constructive Solid Geometry](commands.md#constructive-solid-geometry)
         - [Random Numbers](commands.md#random-numbers)
         - [Debugging](commands.md#debugging)
-    - [Loops](loops.md)
-        - [Loop Index](loops.md#loop-index)
-        - [Looping Backwards](loops.md#looping-backwards)
-        - [Looping Over Values](loops.md#looping-over-values)
+    - [Control Flow](control-flow.md)
+        - [Loops](control-flow.md#loops)
+        - [Loop Index](control-flow.md#loop-index)
+        - [Looping Backwards](control-flow.md#looping-backwards)
+        - [Looping Over Values](control-flow.md#looping-over-values)
     - [Blocks](blocks.md)
         - [Options](blocks.md#options)
     - [Scope](scope.md)

Help/literals.md

@@ -135,7 +135,7 @@ Member expressions can be chained, so something like this will also work:
 print data.second.x // x component of the position
 ```
 
-For list-like data, you can use a [for loop](loops.md#looping-over-values) to loop over the top-level values:
+For list-like data, you can use a [for loop](control-flow.md#looping-over-values) to loop over the top-level values:
 
 ```swift
 define positions (

Help/paths.md

@@ -148,7 +148,7 @@ roundrect {
 
 The `circle` command is fine for creating complete circles, but what if you want a circular arc or semicircle? Calculating the Bézier control points for that manually would be tedious, so this is where the power of ShapeScript's procedural logic comes in handy.
 
-To create a path procedurally, you can use a [for loop](loops.md) along with [relative transform commands](transforms.md#relative-transforms) such as `rotate`. For example, the following code generates a pentagon:
+To create a path procedurally, you can use a [for loop](control-flow.md#loops) along with [relative transform commands](transforms.md#relative-transforms) such as `rotate`. For example, the following code generates a pentagon:
 
 ```swift
 path {

Help/scope.md

@@ -13,7 +13,7 @@ This is convenient, because it means that code that defines sub-objects in your
 
 ## Loop Scope
 
-The [for loop](loops.md) also creates a local scope around its body. Unlike block scope, loop scope does not apply to transforms or materials, but only to symbols created using the `define` command.
+The [for loop](control-flow.md#loops) also creates a local scope around its body. Unlike block scope, loop scope does not apply to transforms or materials, but only to symbols created using the `define` command.
 
 Any symbols defined inside a `for` loop will be restricted to the inside of the loop body. This also applies to the optional loop index variable.
 

Help/transforms.md

@@ -45,7 +45,7 @@ It it possible to apply a negative scale factor, which has the effect of flippin
 
 ## Relative Transforms
 
-When defining paths or shapes procedurally using [loops](loops.md) or other logic, you will often wish to position shapes or points using *relative* coordinates, rather than absolutely. You can do this using the `translate`, `rotate` and `scale` commands, which are counterparts to the `position`, `orientation` and `size` options.
+When defining paths or shapes procedurally using [loops](control-flow.md#loops) or other logic, you will often wish to position shapes or points using *relative* coordinates, rather than absolutely. You can do this using the `translate`, `rotate` and `scale` commands, which are counterparts to the `position`, `orientation` and `size` options.
 
 Translation is the mathematical term for directional movement. Like `position`,  `translate`  takes up to 3 values representing offsets along the X Y and Z axes. Unlike `position`, the values do not specify the position of the containing shape, but rather they move the *origin* of the current [scope](scope.md), affecting all subsequently defined shapes.
 

ShapeScriptTests/MetadataTests.swift

@@ -100,7 +100,7 @@ class MetadataTests: XCTestCase {
             ("Expressions", "expressions.md"),
             ("Functions", "functions.md"),
             ("Commands", "commands.md"),
-            ("Loops", "loops.md"),
+            ("Control Flow", "control-flow.md"),
             ("Blocks", "blocks.md"),
             ("Scope", "scope.md"),
             ("Debugging", "debugging.md"),
@@ -193,7 +193,7 @@ class MetadataTests: XCTestCase {
                     continue
                 }
                 let text = try XCTUnwrap(String(contentsOf: absoluteURL))
-                let title = "## \(fragment.replacingOccurrences(of: "-", with: " "))"
+                let title = "## \(fragment.replacingOccurrences(of: "-", with: "[ -]"))"
                 if text.range(of: title, options: [.regularExpression, .caseInsensitive]) == nil {
                     if !url.hasSuffix(file) {
                         XCTFail("anchor \(url)#\(fragment) referenced in \(file) does not exist")