Give instant and atomic types {Cmd a} -> Cmd a (#2552)

This is an alternative, better solution to #2270, which allows us to delete the special-case code added in #2271.  By delaying the argument to `instant` and `atomic`, it will be evaluated at execution time (and thus happen atomically) rather than before.  Closes #2521.

Author: byorgey

data/entities.yaml

@@ -1144,7 +1144,7 @@
     - "To prevent this situation, robot A can wrap the commands in `atomic`, like so:"
     - |
       ```
-      atomic (b <- ishere "rock"; if b {grab; pure ()} {})
+      atomic {b <- ishere "rock"; if b {grab; pure ()} {}}
       ```
   properties: [pickable]
   capabilities: [atomic]

data/scenarios/Challenges/Ranching/_beekeeping/queenbee.sw

@@ -247,7 +247,7 @@ def observeHives =
     end;
 
 def go =
-    instant $ observeHives;
+    instant {observeHives};
     end;
 
 go;

data/scenarios/Challenges/Ranching/_capture/opponent.sw

@@ -60,14 +60,14 @@ def reWatch =
     end;
 
 def reWatchEntities = \instantCont.
-    s1 <- instant (
+    s1 <- instant {
         forDirs (\d. watch d; scan d)
-    );
+    };
     wait 10000;
-    instant (
+    instant {
         s2 <- forDirs scan;
         if (s1 != s2) {instantCont} {}
-    );
+    };
     reWatchEntities instantCont
     end
 

data/scenarios/Challenges/Ranching/_fishing/hauler.sw

@@ -51,7 +51,7 @@ def turnAround = \d.
 
 def waitUntilEnclosureFull =
 
-    isFull <- instant isEitherEnclosureFull;
+    isFull <- instant {isEitherEnclosureFull};
     if isFull {
         // Drive down the road
         turn south;

data/scenarios/Challenges/Ranching/_powerset/setup.sw

@@ -241,7 +241,7 @@ def waitForFirstPlacement =
     end;
 
 def go = \distinctCount.
-    exclusionValue <- instant $ setup distinctCount;
+    exclusionValue <- instant {setup distinctCount};
     give base "bell";
 
     waitForFirstPlacement;

data/scenarios/Challenges/Sliding Puzzles/_sliding-puzzle/maintainer.sw

@@ -194,15 +194,15 @@ def watchBoard =
 def go = \boardWidth. \boardHeight.
 
     // Re-position at the bottom-left corner
-    instant $ atLocation (0, -(boardHeight - 1)) (
+    instant { atLocation (0, -(boardHeight - 1)) (
         handleMarker boardWidth boardHeight;
 
         // NOTE: I originally intended to use 'watch' as a performance optimization.
         // Hoewver, Using 'watch' seems to incur some lag in the 'maintainer' bot's reaction
         // such that the player is not replentished with 'ink' by the time they might
         // want to perform their next 'drill' operation.
         // watchBoard;
-    );
+    )};
 
     // Throttle the recursion, otherwise it will max out the allowed operations per tick
     wait 1;

data/scenarios/Challenges/Sliding Puzzles/_sliding-puzzle/setup.sw

@@ -293,7 +293,7 @@ def setupGame = \boardWidth. \boardHeight.
     end;
 
 def go = \boardWidth. \boardHeight.
-    instant $ setupGame boardWidth boardHeight;
+    instant {setupGame boardWidth boardHeight};
     end;
 
 go 3 3;

data/scenarios/Challenges/_combo-lock/setup.sw

@@ -73,12 +73,12 @@ def createCombo = \colorString.
     end;
 
 def go =
-    comboString <- instant (      
+    comboString <- instant {
         move;
         createCombo "";
-    );
+    };
     // say comboString;
-    instant $ doUntilCorrect comboString;
+    instant {doUntilCorrect comboString};
     end;
 
 go;

data/scenarios/Challenges/_dna/lab.sw

@@ -114,7 +114,7 @@ def placeBase = \standbyFunc. \n.
         clonedOrganism <- placeBase standbyFunc $ n - 1;
 
         // Unwinds the stack; verifies the original placement order
-        placedEnt <- instant waitUntilSomethingExists;
+        placedEnt <- instant {waitUntilSomethingExists};
         let isGood = ent == placedEnt in
         move;
 
@@ -139,7 +139,7 @@ def makeDnaStrand = \receptacleLoc.
     case eitherClonedOrganism (\_.
         create "pixel (R)";
     ) (\clonedItem.
-        instant $ (
+        instant {
             teleport self (0, -11);
             waitUntilHere "switch (on)";
 
@@ -155,13 +155,13 @@ def makeDnaStrand = \receptacleLoc.
             create slideBox;
             give base slideBox;
             say $ "You got a new \"" ++ slideBox ++ "\"";
-        );
+        };
     );
     end;
 
 def waitForCloneableOrganism =
     let receptacleLoc = waypointByIndex "receiver" 0 in
-    organism <- instant (
+    organism <- instant {
         teleport self receptacleLoc;
 
         waitUntilOccupied;
@@ -170,7 +170,7 @@ def waitForCloneableOrganism =
         pure $ case thingHere (\x. inL x) (\item.
           if (hastag item "organism") {inR item} {inL ()}
         )
-    );
+    };
 
     case organism (\_.
         say "Not a cloneable organism!";

data/scenarios/Challenges/_dna/mirrorbot.sw

@@ -91,7 +91,7 @@ def waitUntilEmpty =
     end;
 
 def go =
-    instant waitUntilHere;
+    instant {waitUntilHere};
     waitUntilEmpty;
     go;
     end;