Debug bridge improvements

UIX.Debug/Bridge.compat.cs

@@ -0,0 +1,25 @@
+#if !ZUNE5
+
+using Microsoft.Iris.Debug.Data;
+
+namespace Microsoft.Iris.Debug
+{
+    /// <summary>
+    /// A dummy implementation of <see cref="IBridge"/>, used to avoid conditional
+    /// code in consuming libraries.
+    /// </summary>
+    public class Bridge : IBridge
+    {
+        public void LogDispatcher(string message)
+        {
+            
+        }
+
+        public void LogInterpreterOpCode(object context, InterpreterEntry entry)
+        {
+            
+        }
+    }
+}
+
+#endif

UIX.Debug/Bridge.cs

@@ -2,16 +2,13 @@
 
 using OwlCore.Remoting;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Microsoft.Iris.Debug
 {
     [RemoteProperty]
     [RemoteMethod]
     [RemoteOptions(RemotingDirection.Bidirectional)]
-    public class Bridge : IDisposable
+    public class Bridge : IBridge, IDisposable
     {
         private readonly MemberRemote _memberRemote;
 

UIX.Debug/Data/InterpreterEntry.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace Microsoft.Iris.Debug.Data
@@ -8,17 +9,22 @@ namespace Microsoft.Iris.Debug.Data
         public InterpreterEntry(object opCode, params OpCodeArgument[] args)
         {
             OpCode = opCode;
-            Arguments = args;
+
+            if (args != null)
+                Arguments = args;
+            else
+                Arguments = new List<OpCodeArgument>();
         }
 
-        public object OpCode { get; private set; }
-        public OpCodeArgument[] Arguments { get; private set; }
+        public object OpCode { get; }
+        public IList<OpCodeArgument> Arguments { get; }
+        public IList<object> ReturnValues { get; } = new List<object>();
 
         public override string ToString()
         {
             var args =
 #if ZUNE5
-                (System.Collections.Generic.IEnumerable<OpCodeArgument>)Arguments;
+                Arguments;
 #else
                 Arguments.Select(a => a.ToString()).ToArray();
 #endif
@@ -28,8 +34,16 @@ namespace Microsoft.Iris.Debug.Data
 
     public class OpCodeArgument
     {
-        public Type Type { get; private set; }
-        public object Value { get; private set; }
+        public string Name { get; set; }
+        public Type Type { get; set; }
+        public object Value { get; set; }
+
+        public OpCodeArgument(string name, Type type, object value)
+        {
+            Name = name;
+            Type = type;
+            Value = value;
+        }
 
         public override string ToString() => $"{Type} {Value}";
     }

UIX.Debug/IBridge.cs

@@ -0,0 +1,15 @@
+namespace Microsoft.Iris.Debug
+{
+    internal interface IBridge
+    {
+        /// <summary>
+        /// Logs the context, opcode, and arguments of an instruction
+        /// executed by <c>Microsoft.Iris.Markup.Interpreter</c>.
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="entry"></param>
+        public void LogInterpreterOpCode(object context, Data.InterpreterEntry entry);
+
+        public void LogDispatcher(string message);
+    }
+}

UIX.Debug/UIX.Debug.csproj

@@ -14,6 +14,7 @@
 
     <ItemGroup Condition=" '$(UseZune5)' == 'true' ">
         <PackageReference Include="OwlCore" Version="0.0.67" />
+        <PackageReference Include="Cauldron.BasicInterceptors" Version="3.2.3" />
     </ItemGroup>
 
     <PropertyGroup Condition=" '$(UseZune5)' == 'true' ">