From 6acdde8f7093c0fb2e95d8dbc14dfab096b0a027 Mon Sep 17 00:00:00 2001
From: James Barnett <noreply@jamesbarnett.xyz>
Date: Mon, 23 Jul 2018 20:16:07 +0100
Subject: Move lambda calls outside of parens

---
 src/main/kotlin/cpu/opcodes/Loads16Bit.kt | 42 +++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'src/main/kotlin/cpu/opcodes/Loads16Bit.kt')

diff --git a/src/main/kotlin/cpu/opcodes/Loads16Bit.kt b/src/main/kotlin/cpu/opcodes/Loads16Bit.kt
index 2f679c3..73e5363 100644
--- a/src/main/kotlin/cpu/opcodes/Loads16Bit.kt
+++ b/src/main/kotlin/cpu/opcodes/Loads16Bit.kt
@@ -8,14 +8,14 @@ import BitManipulation as bm
 
 var loads16Bit = mapOf(
 
-  0x01 to Operation("LD BC,nn", 2, 12, {r, _, a -> r.BC = bm.argsToWord(a)}),
-  0x11 to Operation("LD DE,nn", 2, 12, {r, _, a -> r.DE = bm.argsToWord(a)}),
-  0x21 to Operation("LD HL,nn", 2, 12, {r, _, a -> r.HL = bm.argsToWord(a)}),
-  0x31 to Operation("LD SP,nn", 2, 12, {r, _, a -> r.SP = bm.argsToWord(a)}),
+  0x01 to Operation("LD BC,nn", 2, 12) { r, _, a -> r.BC = bm.argsToWord(a)},
+  0x11 to Operation("LD DE,nn", 2, 12) { r, _, a -> r.DE = bm.argsToWord(a)},
+  0x21 to Operation("LD HL,nn", 2, 12) { r, _, a -> r.HL = bm.argsToWord(a)},
+  0x31 to Operation("LD SP,nn", 2, 12) { r, _, a -> r.SP = bm.argsToWord(a)},
 
-  0xF9 to Operation("LD SP,HL", 0, 8, {r, _, _ -> r.SP = r.HL}),
+  0xF9 to Operation("LD SP,HL", 0, 8) { r, _, _ -> r.SP = r.HL},
 
-  0xF8 to Operation("LDHL SP,n", 1, 12, {r, _, a ->
+  0xF8 to Operation("LDHL SP,n", 1, 12) { r, _, a ->
 
     // https://stackoverflow.com/questions/5159603/gbz80-how-does-ld-hl-spe-affect-h-and-c-flags
     // the carry flag is set if there's an overflow from the 7th to 8th bit.
@@ -35,34 +35,34 @@ var loads16Bit = mapOf(
       r.HL = r.SP + absoluteValue
     }
 
-  }),
-  0x08 to Operation("LD (nn),SP", 2, 20, {r, m, a ->
+  },
+  0x08 to Operation("LD (nn),SP", 2, 20) { r, m, a ->
     m.writeByte(bm.argsToWord(a), bm.getLsb(r.SP))
     m.writeByte(bm.argsToWord(a) + 1, bm.getMsb(r.SP))
     // TODO - not sure if the lsb/msb order is right here
-  }),
+  },
 
-  0xF5 to Operation("PUSH AF", 0, 16, {r, m, _ ->
+  0xF5 to Operation("PUSH AF", 0, 16) { r, m, _ ->
     m.writeByte(r.decrementAndGetSP(), bm.getMsb(r.AF))
     m.writeByte(r.decrementAndGetSP(), bm.getLsb(r.AF))
-  }),
-  0xC5 to Operation("PUSH BC", 0, 16, {r, m, _ ->
+  },
+  0xC5 to Operation("PUSH BC", 0, 16) { r, m, _ ->
     m.writeByte(r.decrementAndGetSP(), bm.getMsb(r.BC))
     m.writeByte(r.decrementAndGetSP(), bm.getLsb(r.BC))
-  }),
-  0xD5 to Operation("PUSH DE", 0, 16, {r, m, _ ->
+  },
+  0xD5 to Operation("PUSH DE", 0, 16) { r, m, _ ->
     m.writeByte(r.decrementAndGetSP(), bm.getMsb(r.DE))
     m.writeByte(r.decrementAndGetSP(), bm.getLsb(r.DE))
-  }),
-  0xE5 to Operation("PUSH HL", 0, 16, {r, m, _ ->
+  },
+  0xE5 to Operation("PUSH HL", 0, 16) { r, m, _ ->
     m.writeByte(r.decrementAndGetSP(), bm.getMsb(r.HL))
     m.writeByte(r.decrementAndGetSP(), bm.getLsb(r.HL))
-  }),
+  },
 
-  0xF1 to Operation("POP AF", 0, 12, {r, m, _ -> r.AF = pop(r, m)}),
-  0xC1 to Operation("POP BC", 0, 12, {r, m, _ -> r.BC = pop(r, m)}),
-  0xD1 to Operation("POP DE", 0, 12, {r, m, _ -> r.DE = pop(r, m)}),
-  0xE1 to Operation("POP HL", 0, 12, {r, m, _ -> r.HL = pop(r, m)})
+  0xF1 to Operation("POP AF", 0, 12) { r, m, _ -> r.AF = pop(r, m)},
+  0xC1 to Operation("POP BC", 0, 12) { r, m, _ -> r.BC = pop(r, m)},
+  0xD1 to Operation("POP DE", 0, 12) { r, m, _ -> r.DE = pop(r, m)},
+  0xE1 to Operation("POP HL", 0, 12) { r, m, _ -> r.HL = pop(r, m)}
 
 )
 
-- 
cgit v1.2.3