various cleanups

Cargo.toml

@@ -1,3 +1,4 @@
 [workspace]
 
 members = ["klang"]
+resolver = "2"

examples/clean_up_cans.k

@@ -1,14 +1,5 @@
-# /usr/bin/env klang
-# Defines a simple klang program.
 # This program is designed to get a robot to clean up soda cans.
 
-action <Teleop> {
-    outcomes {
-        success [Success]
-        failure [Failure]
-    }
-}
-
 action <Find {item}> {
     notes {
         prefer [Move quickly]
@@ -20,6 +11,7 @@ action <Find {item}> {
     outcomes {
         success [Found {item}]
         failure [Haven't moved in a while]
+        retry [Actively looking for {item}]
     }
 }
 

klang/src/klang.pest

@@ -23,10 +23,11 @@ ACTIONS = { "actions" }
 UNTIL = { "until" }
 
 // Names
+CHAR = { ASCII_ALPHANUMERIC | "." | "_" | "/" | "!" | "?" | " " | "," | "\"" | "\'" | "/" | "\\" }
+VARIABLE = { LBRACE ~ CHAR+ ~ RBRACE }
 ACTION_NAME = { "<" ~ NAME ~ ">" }
 OUTCOME_NAME = { "[" ~ NAME ~ "]" }
-CHAR = { ASCII_ALPHANUMERIC | "." | "_" | "/" | "!" | "?" | " " | "," | "\"" | "\'" | "/" | "\\" | "{" | "}" }
-NAME = { CHAR+ }
+NAME = { (CHAR | VARIABLE)+ }
 
 // Braces.
 LBRACE = { "{" }