feat: renaming assign eval and removing naming requirements (#106)

Author: Frnd-me

src/main/kotlin/at/ac/uibk/dps/cirrina/execution/object/Action.kt

@@ -6,7 +6,7 @@ sealed interface Action {
   companion object {
     fun create(description: ActionDescription, name: String? = null): Action =
       when (description) {
-        is AssignDescription -> EvalAction(Expression.create(description.expression))
+        is EvalDescription -> EvalAction(Expression.create(description.expression))
 
         is InvokeDescription ->
           InvokeAction(

src/main/resources/pkl/csm/csml.pkl

@@ -2,13 +2,13 @@
 module at.ac.uibk.dps.cirrina.csm.Csml
 
 /// The name of an instance of a state machine or "*" to refer to all instances.
-typealias InstanceName = String(matches(Regex(#"^[a-zA-Z_]\w*$"#)))
+typealias InstanceName = String
 
 /// The name of a state machine.
-typealias StateMachineName = String(matches(Regex(#"^[a-zA-Z_]\w*$"#)))
+typealias StateMachineName = String
 
 /// The subscription to events raised by state machine instances.
-typealias Subscription = String(matches(Regex(#"^([a-zA-Z_]\w*|\*)$"#)))
+typealias Subscription = String
 
 class Instance {
   stateMachineName: StateMachineName
@@ -32,7 +32,7 @@ bindings: Listing<ServiceImplementationBinding>?
 typealias Expression = String
 
 /// The name of a variable.
-typealias VariableName = String(matches(Regex(#"^[a-zA-Z_]\w*$"#)))
+typealias VariableName = String
 
 /// A context declaration consisting of variable names and value expressions.
 typealias Context = Mapping<VariableName, Expression>
@@ -42,17 +42,17 @@ class CollaborativeStateMachineDescription {
   stateMachines: Mapping<StateMachineName, StateMachineDescription>
 }
 
-typealias StateName = String(matches(Regex(#"^[a-zA-Z_]\w*$"#)))
+typealias StateName = String
 
 class StateMachineDescription {
   states: Mapping<StateName, StateDescription>
   nested: Mapping<StateMachineName, StateMachineDescription>
   transient: Context?
 }
 
-typealias EventName = String(matches(Regex(#"^[a-zA-Z_]\w*$"#)))
+typealias EventName = String
 
-typealias TimeoutName = String(matches(Regex(#"^[a-zA-Z_]\w*$"#)))
+typealias TimeoutName = String
 
 open class StateDescription {
   initial: Boolean = false
@@ -88,7 +88,7 @@ class TransitionDescription {
 
 abstract class ActionDescription {}
 
-typealias InvocationType = String(matches(Regex(#"^[a-zA-Z_]\w*$"#)))
+typealias InvocationType = String
 
 typealias InvocationMode = "local"|"remote"
 
@@ -99,10 +99,11 @@ class InvokeDescription extends ActionDescription {
   emits: Listing<EventDescription>
 }
 
-class AssignDescription extends ActionDescription {
+class EvalDescription extends ActionDescription {
   expression: Expression
 }
 
+
 class EmitDescription extends ActionDescription {
   event: EventDescription
   target: Expression?
@@ -113,10 +114,12 @@ class TimeoutDescription extends ActionDescription {
   triggers: EmitDescription
 }
 
+
 class ResetDescription extends ActionDescription {
   name: TimeoutName
 }
 
+
 class CaseDescription {
   of: Expression
   yields: Listing<ActionDescription>
@@ -131,7 +134,7 @@ class LogDescription extends ActionDescription {
   message: Expression
 }
 
-typealias EventTopic = String(matches(Regex(#"^[a-zA-Z_]\w*$"#)))
+typealias EventTopic = String
 
 typealias EventChannel = "internal"|"external"|"peripheral"
 
@@ -178,7 +181,7 @@ typealias Transition = TransitionDescription
 
 // Action aliases
 typealias Action = ActionDescription
-typealias Assign = AssignDescription
+typealias Eval = EvalDescription
 typealias Invoke = InvokeDescription
 typealias Case = CaseDescription
 typealias Match = MatchDescription

src/test/resources/pkl/complete/main.pkl

@@ -31,11 +31,11 @@ collaborativeStateMachine {
               emits { new Internal { topic = "e2" } }
             }
           }
-          exit { new Assign { expression = "e = true" } }
+          exit { new Eval { expression = "e = true" } }
           on {
             ["e2"] = new Transition {
               to = "c"
-              yields { new Assign { expression = "x = $v" } }
+              yields { new Eval { expression = "x = $v" } }
             }
           }
         }
@@ -51,8 +51,8 @@ collaborativeStateMachine {
         ["d"] = new State {
           static { ["d"] = "100" }
           entry {
-            new Assign { expression = "v = x" }
-            new Assign { expression = "d = d - 1" }
+            new Eval { expression = "v = x" }
+            new Eval { expression = "d = d - 1" }
             new Match {
               cases {
                 new Case {
@@ -68,7 +68,7 @@ collaborativeStateMachine {
             ["e4"] = new Transition { to = "d" }
           }
         }
-        ["e"] = new Terminal { entry { new Assign { expression = "b = true" } } }
+        ["e"] = new Terminal { entry { new Eval { expression = "b = true" } } }
       }
       transient { ["x"] = "0" }
     }

src/test/resources/pkl/events/main.pkl

@@ -17,7 +17,7 @@ collaborativeStateMachine {
         ["c"] = new Terminal {
           entry {
             new Emit { event { topic = "e5" } }
-            new Assign { expression = "b = true" }
+            new Eval { expression = "b = true" }
           }
         }
         ["d"] = new Terminal {}
@@ -61,7 +61,7 @@ collaborativeStateMachine {
           }
         }
         ["b"] = new Terminal {}
-        ["c"] = new Terminal { entry { new Assign { expression = "c = true" } } }
+        ["c"] = new Terminal { entry { new Eval { expression = "c = true" } } }
       }
     }
   }

src/test/resources/pkl/invoke/main.pkl

@@ -21,14 +21,14 @@ collaborativeStateMachine {
                   input { ["v"] = "v" }
                   emits { new Internal { topic = "tob" } }
                 }
-                new Assign { expression = "e = e + 1" }
+                new Eval { expression = "e = e + 1" }
               }
             }
             ["tob"] = new Transition { to = "b" }
           }
         }
         ["b"] = new State {
-          entry { new Assign { expression = "v = $v" } }
+          entry { new Eval { expression = "v = $v" } }
           always {
             new Transition {
               to = "a"

src/test/resources/pkl/pingPong/main.pkl

@@ -6,7 +6,7 @@ collaborativeStateMachine {
       states {
         ["a"] = new Initial {
           entry {
-            new Assign { expression = "v = v + 1" }
+            new Eval { expression = "v = v + 1" }
             new Emit { event { topic = "e1" } }
           }
           on { ["e2"] = new Transition { to = "b" } }
@@ -32,7 +32,7 @@ collaborativeStateMachine {
         }
         ["b"] = new State {
           entry {
-            new Assign { expression = "v = v + 1" }
+            new Eval { expression = "v = v + 1" }
             new Emit { event { topic = "e2" } }
           }
           on { ["e3"] = new Transition { to = "a" } }

src/test/resources/pkl/timeout/main.pkl

@@ -19,7 +19,7 @@ collaborativeStateMachine {
                   cases {
                     new Case {
                       of = "v < 10"
-                      yields { new Assign { expression = "v = v + 1" } }
+                      yields { new Eval { expression = "v = v + 1" } }
                     }
                   }
                   default = new Emit { event = new Internal { topic = "tob" } }