From 0a3cb5f23f37dcfdcd3c6c052b15d57be2aef6a2 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sun, 21 Jun 2020 08:50:50 +1000 Subject: [PATCH] Enable SA1410 and fix noncompliance "Remove delegate parenthesis when possible" --- Common.ruleset | 3 --- src/BizHawk.Emulation.Cores/CPUs/Intel8048/Interrupts.cs | 2 +- src/BizHawk.Emulation.Cores/CPUs/MC6800/Interrupts.cs | 4 ++-- src/BizHawk.Emulation.Cores/CPUs/MC6809/Interrupts.cs | 6 +++--- src/BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs | 6 +++--- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Common.ruleset b/Common.ruleset index 8faa394819..23e2d7c20d 100644 --- a/Common.ruleset +++ b/Common.ruleset @@ -466,9 +466,6 @@ - - - diff --git a/src/BizHawk.Emulation.Cores/CPUs/Intel8048/Interrupts.cs b/src/BizHawk.Emulation.Cores/CPUs/Intel8048/Interrupts.cs index 36d76d4b28..f75a95ad95 100644 --- a/src/BizHawk.Emulation.Cores/CPUs/Intel8048/Interrupts.cs +++ b/src/BizHawk.Emulation.Cores/CPUs/Intel8048/Interrupts.cs @@ -35,7 +35,7 @@ namespace BizHawk.Emulation.Cores.Components.I8048 public bool TimIntEn; public bool INT_MSTR; - public Action IRQCallback = delegate () { }; + public Action IRQCallback = () => {}; private void ResetInterrupts() { diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6800/Interrupts.cs b/src/BizHawk.Emulation.Cores/CPUs/MC6800/Interrupts.cs index 795ed209ef..abcf695b21 100644 --- a/src/BizHawk.Emulation.Cores/CPUs/MC6800/Interrupts.cs +++ b/src/BizHawk.Emulation.Cores/CPUs/MC6800/Interrupts.cs @@ -49,8 +49,8 @@ namespace BizHawk.Emulation.Cores.Components.MC6800 public bool NMIPending; public bool IRQPending; - public Action IRQCallback = delegate () { }; - public Action NMICallback = delegate () { }; + public Action IRQCallback = () => {}; + public Action NMICallback = () => {}; private void ResetInterrupts() { diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6809/Interrupts.cs b/src/BizHawk.Emulation.Cores/CPUs/MC6809/Interrupts.cs index d5fe5f606e..094463cbd9 100644 --- a/src/BizHawk.Emulation.Cores/CPUs/MC6809/Interrupts.cs +++ b/src/BizHawk.Emulation.Cores/CPUs/MC6809/Interrupts.cs @@ -78,9 +78,9 @@ namespace BizHawk.Emulation.Cores.Components.MC6809 public bool IRQPending; public bool IN_SYNC; - public Action IRQCallback = delegate () { }; - public Action FIRQCallback = delegate () { }; - public Action NMICallback = delegate () { }; + public Action IRQCallback = () => {}; + public Action FIRQCallback = () => {}; + public Action NMICallback = () => {}; private void ResetInterrupts() { diff --git a/src/BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs b/src/BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs index a5a2b26c81..e6c6cbfad8 100644 --- a/src/BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs +++ b/src/BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs @@ -34,12 +34,12 @@ namespace BizHawk.Emulation.Cores.Components.Z80A set { if (value < 0 || value > 2) throw new ArgumentOutOfRangeException(); interruptMode = value; } } - public Action IRQCallback = delegate () { }; - public Action NMICallback = delegate () { }; + public Action IRQCallback = () => {}; + public Action NMICallback = () => {}; // this will be a few cycles off for now // it should suffice for now until Alyosha returns from hiatus - public Action IRQACKCallback = delegate () { }; + public Action IRQACKCallback = () => {}; private void NMI_() {