ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve encapsulation of InvokerImpl

This commit is contained in:
YoshiRulz 2021-03-26 14:27:26 +10:00
parent a6f1156012
commit d43d8fc38c
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/BizHawk.BizInvoke/BizInvoker.cs
View File

@ -16,20 +16,38 @@ namespace BizHawk.BizInvoke
/// </summary> /// </summary>
private class InvokerImpl private class InvokerImpl
{ {
public Type ImplType; private readonly Action<object, ICallingConventionAdapter> _connectCallingConventionAdapter;
public List<Action<object, IImportResolver, ICallingConventionAdapter>> Hooks;
public Action<object, IMonitor> ConnectMonitor; private readonly Action<object, IMonitor> _connectMonitor;
public Action<object, ICallingConventionAdapter> ConnectCallingConventionAdapter;
private readonly List<Action<object, IImportResolver, ICallingConventionAdapter>> _hooks;
private readonly Type _implType;
public readonly bool IsMonitored;
public InvokerImpl(
List<Action<object, IImportResolver, ICallingConventionAdapter>> hooks,
Type implType,
Action<object, IMonitor> connectMonitor,
Action<object, ICallingConventionAdapter> connectCallingConventionAdapter)
{
_connectCallingConventionAdapter = connectCallingConventionAdapter;
_connectMonitor = connectMonitor;
_hooks = hooks;
_implType = implType;
IsMonitored = connectMonitor != null;
}
public object Create(IImportResolver dll, IMonitor monitor, ICallingConventionAdapter adapter) public object Create(IImportResolver dll, IMonitor monitor, ICallingConventionAdapter adapter)
{ {
var ret = Activator.CreateInstance(ImplType); var ret = Activator.CreateInstance(_implType);
ConnectCallingConventionAdapter(ret, adapter); _connectCallingConventionAdapter(ret, adapter);
foreach (var f in Hooks) foreach (var f in _hooks)
{ {
f(ret, dll, adapter); f(ret, dll, adapter);
} }
ConnectMonitor?.Invoke(ret, monitor); _connectMonitor?.Invoke(ret, monitor);
return ret; return ret;
} }
} }
@ -87,7 +105,7 @@ namespace BizHawk.BizInvoke
} }
} }
if (impl.ConnectMonitor != null) if (impl.IsMonitored)
{ {
throw new InvalidOperationException("Class was previously proxied with a monitor!"); throw new InvalidOperationException("Class was previously proxied with a monitor!");
} }
@ -111,7 +129,7 @@ namespace BizHawk.BizInvoke
} }
} }
if (impl.ConnectMonitor == null) if (!impl.IsMonitored)
{ {
throw new InvalidOperationException("Class was previously proxied without a monitor!"); throw new InvalidOperationException("Class was previously proxied without a monitor!");
} }
@ -188,18 +206,13 @@ namespace BizHawk.BizInvoke
postCreateHooks.Add(hook); postCreateHooks.Add(hook);
} }
var ret = new InvokerImpl return new(
{ postCreateHooks,
Hooks = postCreateHooks, type.CreateType(),
ImplType = type.CreateType() connectMonitor: monitor
}; ? (o, m) => o.GetType().GetField(monitorField.Name).SetValue(o, m)
if (monitor) : null,
{ connectCallingConventionAdapter: (o, a) => o.GetType().GetField(adapterField.Name).SetValue(o, a));
ret.ConnectMonitor = (o, m) => o.GetType().GetField(monitorField.Name).SetValue(o, m);
}
ret.ConnectCallingConventionAdapter = (o, a) => o.GetType().GetField(adapterField.Name).SetValue(o, a);
return ret;
} }
/// <summary> /// <summary>