Akashl/monitor state inheritence wildcard (#446)

Author: akashlal

Source/Core/Runtime/Machines/MachineState.cs

@@ -77,19 +77,21 @@ internal void InitializeState()
             this.IgnoredEvents = new HashSet<Type>();
             this.DeferredEvents = new HashSet<Type>();
 
-            var entryAttribute = this.GetType().GetCustomAttribute(typeof(OnEntryAttribute), true) as OnEntryAttribute;
-            var exitAttribute = this.GetType().GetCustomAttribute(typeof(OnExitAttribute), true) as OnExitAttribute;
-
-            if (entryAttribute != null)
+            if (this.GetType().GetCustomAttribute(typeof(OnEntryAttribute), true) is OnEntryAttribute entryAttribute)
             {
                 this.EntryAction = entryAttribute.Action;
             }
 
-            if (exitAttribute != null)
+            if (this.GetType().GetCustomAttribute(typeof(OnExitAttribute), true) is OnExitAttribute exitAttribute)
             {
                 this.ExitAction = exitAttribute.Action;
             }
 
+            if (this.GetType().IsDefined(typeof(StartAttribute), false))
+            {
+                this.IsStart = true;
+            }
+
             // Events with already declared handlers.
             var handledEvents = new HashSet<Type>();
 
@@ -99,11 +101,6 @@ internal void InitializeState()
             this.InstallActionHandlers(handledEvents);
             this.InstallIgnoreHandlers(handledEvents);
             this.InstallDeferHandlers(handledEvents);
-
-            if (this.GetType().IsDefined(typeof(StartAttribute), false))
-            {
-                this.IsStart = true;
-            }
         }
 
         /// <summary>
@@ -289,9 +286,7 @@ private void InheritActionHandlers(Type baseState, HashSet<Type> handledEvents)
         /// </summary>
         private void InstallIgnoreHandlers(HashSet<Type> handledEvents)
         {
-            var ignoreEventsAttribute = this.GetType().GetCustomAttribute(typeof(IgnoreEventsAttribute), false) as IgnoreEventsAttribute;
-
-            if (ignoreEventsAttribute != null)
+            if (this.GetType().GetCustomAttribute(typeof(IgnoreEventsAttribute), false) is IgnoreEventsAttribute ignoreEventsAttribute)
             {
                 foreach (var e in ignoreEventsAttribute.Events)
                 {
@@ -315,9 +310,7 @@ private void InheritIgnoreHandlers(Type baseState, HashSet<Type> handledEvents)
                 return;
             }
 
-            var ignoreEventsAttribute = baseState.GetCustomAttribute(typeof(IgnoreEventsAttribute), false) as IgnoreEventsAttribute;
-
-            if (ignoreEventsAttribute != null)
+            if (baseState.GetCustomAttribute(typeof(IgnoreEventsAttribute), false) is IgnoreEventsAttribute ignoreEventsAttribute)
             {
                 foreach (var e in ignoreEventsAttribute.Events)
                 {
@@ -341,8 +334,7 @@ private void InheritIgnoreHandlers(Type baseState, HashSet<Type> handledEvents)
         /// </summary>
         private void InstallDeferHandlers(HashSet<Type> handledEvents)
         {
-            var deferEventsAttribute = this.GetType().GetCustomAttribute(typeof(DeferEventsAttribute), false) as DeferEventsAttribute;
-            if (deferEventsAttribute != null)
+            if (this.GetType().GetCustomAttribute(typeof(DeferEventsAttribute), false) is DeferEventsAttribute deferEventsAttribute)
             {
                 foreach (var e in deferEventsAttribute.Events)
                 {
@@ -366,8 +358,7 @@ private void InheritDeferHandlers(Type baseState, HashSet<Type> handledEvents)
                 return;
             }
 
-            var deferEventsAttribute = baseState.GetCustomAttribute(typeof(DeferEventsAttribute), false) as DeferEventsAttribute;
-            if (deferEventsAttribute != null)
+            if (baseState.GetCustomAttribute(typeof(DeferEventsAttribute), false) is DeferEventsAttribute deferEventsAttribute)
             {
                 foreach (var e in deferEventsAttribute.Events)
                 {
@@ -393,7 +384,7 @@ private static void CheckEventHandlerAlreadyDeclared(Type e, HashSet<Type> handl
         {
             if (handledEvents.Contains(e))
             {
-                throw new InvalidOperationException($"declared multiple handlers for '{e}'");
+                throw new InvalidOperationException($"declared multiple handlers for event '{e}'");
             }
         }
 
@@ -404,7 +395,7 @@ private static void CheckEventHandlerAlreadyInherited(Type e, Type baseState, Ha
         {
             if (handledEvents.Contains(e))
             {
-                throw new InvalidOperationException($"inherited multiple handlers for '{e}' from state '{baseState}'");
+                throw new InvalidOperationException($"inherited multiple handlers for event '{e}' from state '{baseState}'");
             }
         }
     }

Source/Core/Runtime/Specifications/Monitor.cs

@@ -246,7 +246,7 @@ internal void MonitorEvent(Event e)
         private void HandleEvent(Event e)
         {
             // Do not process an ignored event.
-            if (this.IgnoredEvents.Contains(e.GetType()))
+            if (this.IsEventIgnoredInCurrentState(e))
             {
                 return;
             }
@@ -283,17 +283,43 @@ private void HandleEvent(Event e)
                     var transition = this.GotoTransitions[e.GetType()];
                     this.GotoState(transition.TargetState, transition.Lambda);
                 }
+                else if (this.GotoTransitions.ContainsKey(typeof(WildCardEvent)))
+                {
+                    // Checks if the event can trigger a goto state transition.
+                    var transition = this.GotoTransitions[typeof(WildCardEvent)];
+                    this.GotoState(transition.TargetState, transition.Lambda);
+                }
                 else if (this.ActionBindings.ContainsKey(e.GetType()))
                 {
                     // Checks if the event can trigger an action.
                     var handler = this.ActionBindings[e.GetType()];
                     this.Do(handler.Name);
                 }
+                else if (this.ActionBindings.ContainsKey(typeof(WildCardEvent)))
+                {
+                    // Checks if the event can trigger an action.
+                    var handler = this.ActionBindings[typeof(WildCardEvent)];
+                    this.Do(handler.Name);
+                }
 
                 break;
             }
         }
 
+        /// <summary>
+        /// Checks if the specified event is ignored in the current monitor state.
+        /// </summary>
+        private bool IsEventIgnoredInCurrentState(Event e)
+        {
+            if (this.IgnoredEvents.Contains(e.GetType()) ||
+                this.IgnoredEvents.Contains(typeof(WildCardEvent)))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Invokes an action.
         /// </summary>
@@ -417,7 +443,9 @@ private void GotoState(Type s, string onExitActionName)
         private bool CanHandleEvent(Type e)
         {
             if (this.GotoTransitions.ContainsKey(e) ||
+                this.GotoTransitions.ContainsKey(typeof(WildCardEvent)) ||
                 this.ActionBindings.ContainsKey(e) ||
+                this.ActionBindings.ContainsKey(typeof(WildCardEvent)) ||
                 e == typeof(GotoStateEvent))
             {
                 return true;